Skip to content

Commit

Permalink
Merge branch release-0.14.1
Browse files Browse the repository at this point in the history
albrow committed Dec 31, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 986c05f + bff04e4 commit 446d764
Showing 6 changed files with 13 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -41,3 +41,10 @@ glide.yaml.
3. If the project does not support semantic versioning, then the version should
be pinned to the latest commit hash. E.g.,
`ref: 2b2c4ccb8692bb9d0ac6411c1fe47bb04be0ee05`.

After you have added/updated a dependency, be sure to run `glide install` to
have Glide install the appropriate version to the `vendor` directory. Then run
`git add -f vendor` to have add the dependency to version control as a
submodule. Submodules are certainly confusing and not ideal, but this is the
only way we know of to install dependencies in the `vendor` folder in a way that
will work with `go get` for users who do not have Glide.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Zoom
====

[![Version](https://img.shields.io/badge/version-0.14.0-5272B4.svg)](https://github.com/albrow/zoom/releases)
[![Circle CI](https://img.shields.io/circleci/project/albrow/zoom.svg)](https://circleci.com/gh/albrow/zoom)
[![Version](https://img.shields.io/badge/version-0.14.1-5272B4.svg)](https://github.com/albrow/zoom/releases)
[![Circle CI](https://img.shields.io/circleci/project/albrow/zoom/master.svg)](https://circleci.com/gh/albrow/zoom/tree/master)
[![GoDoc](https://godoc.org/github.com/albrow/zoom?status.svg)](https://godoc.org/github.com/albrow/zoom)

A blazing-fast datastore and querying engine for Go built on Redis.
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
// atomic transactions, lua scripts, and running Redis commands
// directly if needed.
//
// Version 0.14.0
// Version 0.14.1
//
// For installation instructions, examples, and more information
// visit https://github.com/albrow/zoom.
1 change: 1 addition & 0 deletions vendor/github.com/dchest/uniuri
Submodule uniuri added at 53057c
1 change: 1 addition & 0 deletions vendor/github.com/garyburd/redigo
Submodule redigo added at 6ece6e
1 change: 1 addition & 0 deletions vendor/github.com/tv42/base58
Submodule base58 added at b66494

0 comments on commit 446d764

Please sign in to comment.