Squashed 'src/github.com/abh/geodns/' changes from ab5c7a6..9814e72

9814e72 Merge remote-tracking branch 'miekg/faster1'
163dee0 Use the newer api names
33c176b Add benchmark test

git-subtree-dir: src/github.com/abh/geodns
git-subtree-split: 9814e721f03b90664622de9738a99f23d2f52eab
Merge commit 'd9280a493a561960cdb6ddec5b4424c00f6820c8'
Squashed 'src/github.com/apcera/nats/' changes from 9ca1949..de9cb44

de9cb44 Bump version
f4cbc9e Check for re-entry of reconnect logic
8245d13 Fix for deadlock issue #18
4009333 go fmt

git-subtree-dir: src/github.com/apcera/nats
git-subtree-split: de9cb44dc1e506bb2abe0b7166d9e8648bc521f4
Merge commit 'bdbe508c774754a497a4045ede76af8fc87752cc'
Squashed 'src/github.com/benbjohnson/go-raft/' changes from c5d2a9f..aecf7cf

aecf7cf Merge pull request #138 from philips/add-contact-and-resources
7ed53fe feat(README): add contact and resources section
acd1f65 Merge pull request #135 from goraft/use_ticker
908dd12 refactor(peer.go) use ticker
8a044e7 Merge pull request #134 from JensRantil/doc-improvements
3bbf4cb Additional documentation
ef7586f Add InfluxDB to Projects list.
fdd1851 Merge pull request #132 from JensRantil/correct-readme-link
ee05555 README: benbjohnson => goraft

git-subtree-dir: src/github.com/benbjohnson/go-raft
git-subtree-split: aecf7cf857df4c187f4a8b82b7adcf8057af2d58
Merge commit '1dd5b43de5e998b9f793ffe6cebe72de11af2e85'
Squashed 'src/github.com/bitly/nsq/' changes from 5d05e2c..1c6a642

1c6a642 add moz to README

git-subtree-dir: src/github.com/bitly/nsq
git-subtree-split: 1c6a6425cbe3b6c428668c252b34affef441629f
Merge commit 'fd818d8d672d4dac3eafaaa7f68dba5b571780a4'
Squashed 'src/github.com/buger/gor/' changes from 26ddfcd..f82dade

f82dade Merge pull request #60 from waffleio/master
5f35f41 add waffle.io badge

git-subtree-dir: src/github.com/buger/gor
git-subtree-split: f82dade1273b3d9d9b862670b6733b886d3c57b0
Merge commit '6cd90da5b0591bd00b3c20154dfa5b7848ca8c76'
Squashed 'src/github.com/cloudflare/redoctober/' changes from 3be7cc3..f0b03d5

f0b03d5 Update README.md
f37bb41 Merge pull request #19 from grittygrease/32bit-compatible
8cc69ed Fix passvault on 32-bit systems
056cc55 Add travis-ci build status to README.
60a1cf5 Merge pull request #18 from cloudflare/alberts/travis-ci
3d90b62 Added travis-ci configuration file.
7e9a8d6 Merge pull request #17 from cloudflare/govet-testcode
0dc73c5 Merge pull request #1 from grittygrease/govet-testcode
669d727 Make testcode play nice with go vet
bd1c3db Merge pull request #16 from cloudflare/alberts/droneio
c570a1f Add drone.io build status.
9a5e256 Merge pull request #15 from cloudflare/alberts/issue14
984f95a Tweak error returns to work with older Go.
3bb2a1f Merge pull request #13 from majek/fix_default_vault_location
5e00bad Merge pull request #11 from majek/better_readme2
15f4b5b By default vault should not be stored in /tmp!
dd83f1e Rewritten readme
455df34 Merge pull request #10 from toekneestuck/ui
c9f55e4 Added index.html as an example UI to manage the Red October service
f578934 Add basic checking to username and password.
9d6751a Merge pull request #8 from majek/static_vs_staticpath
4c5cb0e Merge pull request #9 from majek/consistent_http_port
59c4fb1 Be consistent about port number, 8080 not 8000
94d2bcc Documentation says about "-static" flag, not "-staticpath"

git-subtree-dir: src/github.com/cloudflare/redoctober
git-subtree-split: f0b03d58b7c3c946ec424e29b45813dfefec8584
Merge commit 'e35be06b40922968f4d92a1800cca455b4b99454'
Squashed 'src/github.com/cloudfoundry/gorouter/' changes from 4b17972..84171d8

84171d8 symmetry between router.unregister and router.register log msgs
0f34d9d Change router.register log message to Debug
914ff4c Add EmitError to mockEmitter
c2c927d Use NATSClient interface

git-subtree-dir: src/github.com/cloudfoundry/gorouter
git-subtree-split: 84171d87869e38fb98004ffcc06467d0f46c9898
Merge commit '1b32e584d4283886e5d76ac7d80e8a23dcd31968'
Squashed 'src/github.com/cloudfoundry/hm9000/' changes from 46c693d..c124205

c124205 made desired state server more test friendly
130b0c4 removed cassandra
bc4d1f3 removed defunct performance tests. mcat is now just the integration tests
b843d5a support for honey nats clusters
94827dd bump actual freshness on advertise only if there are no heartbeats coming down the pipe
7eb4b6e log when we don't bump freshness
7824615 Actual state listener is more careful when bumping freshness
ed76e92 fix very scary early return epic fail in actual state listener
91ae98b perhaps metrics will be more stable now?

git-subtree-dir: src/github.com/cloudfoundry/hm9000
git-subtree-split: c12420501d3ccabeb61aaabeef0a75a359a0e6af
Merge commit 'dcc47c2c699cc404319e25b960818d3b8d5f6ca9'
Squashed 'src/github.com/cloudfoundry/yagnats/' changes from eabc687..6387bd1

6387bd1 Fix example in README
63cf747 Fix examples to use yagnats.ConnectionInfo
78bc6a8 actually call the callback in the fake

git-subtree-dir: src/github.com/cloudfoundry/yagnats
git-subtree-split: 6387bd1d06da5680d9d8231a529ea5df45852c9f
Merge commit '854a3b7f1dea23f230fb2d4e1b81eda52148b230'
Squashed 'src/github.com/coreos/etcd/' changes from 68e7455..5edaee7

5edaee7 Merge pull request #363 from xiangli-cmu/fix_consistent_redirection
1a7eb36 Merge pull request #372 from philips/bind-addr-ports
9db521c fix(server): override port of bind
d971d22 Merge pull request #375 from philips/fix-reset
e7839e8 fix(etcd): Fix forced config reset
af20be8 Merge pull request #347 from benbjohnson/mod-lock
70e31c7 Merge pull request #371 from polvi/dockerfile
b22c6fe fix(Dockerfile): remove bogus -bind-addr, and use default -addr
b784ced Update mod/lock versioning.
5d865e3 Merge branch 'master' of https://github.com/coreos/etcd into mod-lock
e76b7d1 Add mod/lock version.
f3d438a Add mod/lock connection monitoring.
618def7 Merge pull request #369 from philips/format-json
7ec3f86 fix(README): prettify json
67f3fc3 Merge pull request #368 from philips/cleanup-responses
0dc428b fix(README): use the new response format
e4f1e22 Merge pull request #357 from philips/add-osx-curl-note
aa4660d chore(README): add note about curl on OSX
ded3cc2 fix redirect url should include rawquery
73f04d5 Merge pull request #343 from xiangli-cmu/refactoring_event
c6e1af8 merge master
7875ba2 Merge pull request #360 from philips/fix-peerurl
d5e4aef Merge pull request #361 from philips/cleanup-peers-usage
6729776 fix(server/usage): fixup the usage based on feedback
72bf216 fix(server/v2): redirect to ClientURL not PeerURL
df20be7 Fix test harness.
cfb6eb6 Merge pull request #355 from xiangli-cmu/root_readonly
e34d368 Merge pull request #354 from philips/fixup-prevExist-README
b929e71 tests add root readonly test
6252037 fix root should be rdonly
577d08e Merge pull request #352 from xiangli-cmu/fix_watch_prefix
78e382c test add watcher prefix test
fc562bd fix tests bump deps
1d02a70 feat(README): add a prevExist example
ff081dc Merge pull request #353 from baruch/patch-1
cc9c75a fix(README): repair some noisy spaces
08dffe8 Fix spelling mistakes in internal-protocol-versioning.md
5097a2a fix(event_history.go) should not scan prefix
7997fdc Merge pull request #330 from philips/fixup-readme-remove-v1
2a5030b fix(README): fix 9 instances of v1
d517284 Merge pull request #342 from philips/use-machine-nomenclature
03571d3 Merge branch 'master' of https://github.com/coreos/etcd into mod-lock
d8e9838 Lock testing.
67b4c27 refactor change node_repr to node_extern
b7d07ea refactor event
08c5989 refactor(Node) do not expose node struct
22c2935 Initial mod_lock acquire.
978cb54 fix(README): use machine instead of node
d3a8380 fix(README): link to etcdctl directly
e41b86f Merge pull request #341 from philips/fixup-name-and-data-dir-guessing
74ad50e Merge branch 'master' of https://github.com/coreos/etcd into mod-lock
3286124 mod/lock
0344e75 Merge pull request #340 from philips/add-rthomas-clj-etcd
04711ec fix(etcd): fixup the name and data dir guessing
da666d9 feat(README): add clojure client rthomas/clj-etcd
c93f086 Merge pull request #329 from philips/remove-redundant-datadir-code
7c07810 fix(etcd): remove duplicate DataDir setup
0ed3509 Merge pull request #324 from philips/redirect-mod-dashboard-trailing-slash
64e4972 fix(mod): redirect dashboard to /dashboard
b4f3d02 Merge pull request #322 from xiangli-cmu/master
a607c9e fix dep issue
4520705 Merge pull request #320 from philips/add-cors-options
40a574a wip commit
522a833 bump go-etcd
8a0496c bump deps
b190c42 chore(mod/dashboard/resources): use the latest version of the code
4c06e19 fix(mod/dashboard): grab the leader URL
a1ec895 feat(server): introduce a cors handler
228754a mod_lock

git-subtree-dir: src/github.com/coreos/etcd
git-subtree-split: 5edaee79e67c27135b3d936e368c4b1261f22918
Merge commit 'c222d97832e47cc02e0b8bffcbdfd5e7071a8229'