329 Commits

Author SHA1 Message Date
Brandon Philips
e0b8771950 fix(test): add sleep in createCluster
The problem is that if the master isn't up when the children start then
the children have to retry. This retry can take upwards of 15 seconds
which slows tests way down and some of them fail.
2013-08-08 16:44:10 -07:00
Xiang Li
b36feec757 Merge pull request #71 from philips/pretty-print-conf
chore(etcd): pretty print the conf json
2013-08-08 14:08:28 -07:00
Brandon Philips
5000e1de4a chore(etcd): pretty print the conf json
someone might edit this so pretty print it.
2013-08-08 13:59:45 -07:00
Xiang Li
f6e5d29f58 Merge pull request #70 from philips/fixup-cli-options
Lots of cleanups around command line parsing
2013-08-08 13:59:15 -07:00
Brandon Philips
9d488f5529 fix(README): change -i to -f 2013-08-08 13:49:39 -07:00
Brandon Philips
04318ff1be fix(etcd): rename ignore to force
It was suprising that the ignore file deleted node configuration. Change
the name to force!
2013-08-08 13:27:00 -07:00
Brandon Philips
27000cf5df chore(etcd): un-nest error handling logic 2013-08-08 13:19:33 -07:00
Brandon Philips
99d69cf842 feat(etcd): print out log line of where the configuration is
It is a bit confusing that your flags are ignored if there is an
existing info file. Inform the user.
2013-08-08 13:11:29 -07:00
Brandon Philips
5e8f9a57a5 fix(etcd): use . as the storage
/tmp is convienent but a little unexpected. Just use the cwd.
2013-08-08 12:58:11 -07:00
Brandon Philips
6a9a0a6fbe fix(etcd): use Info structs for "start" functions
instead of passing in half of the info pass everything in as info
structs
2013-08-08 12:49:35 -07:00
Brandon Philips
8e5a24d367 chore(etcd): introduce argInfo variable
reduce the global sprawl and put all of the basic info in an instance of
Info Struct
2013-08-08 12:17:25 -07:00
Brandon Philips
f946ff0aab fix(etcd): log same port argument 2013-08-08 12:07:58 -07:00
Brandon Philips
17cfe22a55 bump(code.google.com/p/go.net): 3591c18acabc 2013-08-07 13:52:29 -07:00
Brandon Philips
044c6593a2 bump(github.com/ccding/go-config-reader): 02eda1a8218709cdcbd6fe2d53cd76128ac13526 2013-08-07 13:52:26 -07:00
Brandon Philips
b1f1af82f9 bump(github.com/coreos/go-etcd): c21388f46a08162660f44cc7c7267cc4c66d571e 2013-08-07 13:52:22 -07:00
Xiang Li
8dc7dd7ea0 Merge pull request #68 from philips/refactor-third_party-a-bit
chore(update): put the deps into their own file
2013-08-07 09:51:48 -07:00
Brandon Philips
7247d9b3ee chore(update): put the deps into their own file 2013-08-07 09:32:21 -07:00
Xiang Li
a790fbc975 Merge pull request #55 from xiangli-cmu/master
Update
2013-08-06 23:07:00 -07:00
Xiang Li
e5aa6256f0 Merge https://github.com/coreos/etcd 2013-08-06 19:57:03 -07:00
Xiang Li
b8cefd39c9 Merge pull request #63 from philips/add-travis.yml
Add travis.yml
2013-08-06 19:33:59 -07:00
Brandon Philips
ba7ddbc015 feat(README): add a travis badge 2013-08-06 18:47:02 -07:00
Brandon Philips
3f07b37ada fix(third_party): etcd from go-etcd was accidently gitignored
gitignore messup ignored thie directory. Add it!
2013-08-06 18:40:12 -07:00
Brandon Philips
d7c6d0c672 fix(gitignore): be more specific on dirs 2013-08-06 18:39:23 -07:00
Brandon Philips
a6b7b8ce3f fix(gitignore): ignore the etcd binary not everything
fixes a problem with go-etcd not being added to third_party
2013-08-06 18:38:00 -07:00
Brandon Philips
8144c404e6 bump(code.google.com/p/goprotobuf): 44b59d41add2 2013-08-06 18:35:55 -07:00
Brandon Philips
af2fa2adad bump(github.com/ccding/go-config-reader): fcf8cc3fb5100a2466c414cea91a4bb6344087fd 2013-08-06 18:35:49 -07:00
Xiang Li
4bf87b8cb2 Merge pull request #64 from Mistobaan/master
more cleanups
2013-08-06 17:55:38 -07:00
Brandon Philips
f746b1e4f1 feat(travis.yml): Initial commit 2013-08-06 17:50:20 -07:00
Fabrizio (Misto) Milo
a15b4bb687 gofmt 2013-08-06 17:46:21 -07:00
Fabrizio (Misto) Milo
742589aa72 nip 2013-08-06 17:34:39 -07:00
Fabrizio (Misto) Milo
1b69ebcb6c nip 2013-08-06 17:26:52 -07:00
Fabrizio (Misto) Milo
efc14b719d nip 2013-08-06 17:24:51 -07:00
Xiang Li
c109da4b43 Merge pull request #62 from philips/re-add-etcd-to-banner
fix(client_handlers): re-add etcd name to banner
2013-08-06 17:23:43 -07:00
Brandon Philips
dc6480dda8 fix(gitignore): ignore the pkg dir 2013-08-06 17:21:43 -07:00
Brandon Philips
436e2a857f fix(test): update this to use build
use all of the same packages as the build script
2013-08-06 17:20:58 -07:00
Fabrizio (Misto) Milo
4247e1ce74 prevent white spaces as being accepted as valid host 2013-08-06 17:20:40 -07:00
Fabrizio (Misto) Milo
50277df74c format 2013-08-06 17:19:49 -07:00
Brandon Philips
51ae55edff fix(client_handlers): re-add etcd name to banner
this was removed in the version shuffle.
2013-08-06 17:13:29 -07:00
Fabrizio (Misto) Milo
11a7cd0bc2 nip 2013-08-06 17:11:10 -07:00
Fabrizio (Misto) Milo
63f28bacdd nip doc 2013-08-06 17:08:52 -07:00
Xiang Li
115dbdb927 Merge pull request #61 from Mistobaan/master
some go cleanups
2013-08-06 16:53:52 -07:00
Fabrizio (Misto) Milo
b6378dae51 use go's syntax 2013-08-06 16:47:57 -07:00
Fabrizio (Misto) Milo
0de2eff583 use switch 2013-08-06 16:41:00 -07:00
Brandon Philips
7c6d383227 Merge pull request #60 from philips/const-the-versions
fix(version): make the version numbers const
2013-08-06 16:06:39 -07:00
Brandon Philips
ab9c0448c9 fix(version): make the version numbers const
simple fix, thanks to @fmilo in #coreos
2013-08-06 16:03:45 -07:00
Xiang Li
bbdc80274a Merge pull request #59 from philips/generate-release-version
feat(version): generate version from git tags
2013-08-06 15:55:12 -07:00
Xiang Li
14436fc9c5 Merge pull request #58 from philips/update-third-party
fix(third_party): don't intermix go-raft
2013-08-06 15:43:26 -07:00
Brandon Philips
a7deba0f90 feat(version): generate version from git tags
This will generate the version based on git tags. So if it is built
directly on a tag it will use the tag name and if it is built off a
commit that isn't a tag it will look like:

    $ curl localhost:7001
    0-267-ga39cf1c
2013-08-06 15:39:30 -07:00
Brandon Philips
253765d81e bump(github.com/coreos/go-raft): e129a0807cdcbd53440c1d722907043d06c16f1b 2013-08-06 12:48:59 -07:00
Brandon Philips
9115a7e422 fix(third_party): don't intermix go-raft
the previous commit added both benbjohnson and coreos go-raft repos.
This is just asking for trouble. Only use the coreos version in the
third_party directory and maintain the coreos/master branch.
2013-08-06 12:47:55 -07:00