8927 Commits

Author SHA1 Message Date
Xiang Li
2b6c628342 Merge branch '0.2' of https://github.com/coreos/etcd into 0.2 2013-10-14 12:57:38 -07:00
Xiang Li
c87a7a039e feat test both of the condidtion 2013-10-14 12:57:35 -07:00
Ben Johnson
89660ce0cd Merge pull request #234 from benbjohnson/raft-server-interface
Use raft.Server interface.
2013-10-14 12:55:29 -07:00
Ben Johnson
e7598075ac Use raft.Server interface. 2013-10-14 13:51:20 -06:00
Brandon Philips
ad5cfab5ba Merge pull request #232 from adrianlzt/patch-1
A little lit bit easy to read
2013-10-14 10:59:39 -07:00
Ben Johnson
4f5ec77f87 Merge pull request #233 from benbjohnson/store-interface
Extract Store into an interface.
2013-10-14 10:57:55 -07:00
Adrián
12636ce89c A little lit bit easy to read
I have only reordered to parameters to be according to the first instance executed.
2013-10-14 19:14:14 +02:00
Ben Johnson
1321c63f3b Extract Store into an interface. 2013-10-14 11:12:30 -06:00
Ben Johnson
5a1338ce8a Merge pull request #231 from benbjohnson/test-fix
Fix etcd.NewClient().
2013-10-14 10:07:43 -07:00
Xiang Li
c434f2cae7 Merge pull request #229 from amirhhz/patch-1
Correct index number to match description in 'watch' example
2013-10-14 09:10:29 -07:00
Ben Johnson
a6a32a592d Merge branch '0.2' into test-fix 2013-10-14 10:06:51 -06:00
Ben Johnson
56192b7f85 bump(code.google.com/p/go.net): 355ff0aa1b2e 2013-10-14 10:05:49 -06:00
Ben Johnson
e1003a8623 bump(bitbucket.org/kardianos/osext): 364fb577de68 2013-10-14 10:05:46 -06:00
Ben Johnson
6b55a47090 bump(github.com/coreos/go-systemd): af0e6cd015e5fad8d9d090ad7aa343a1f680318d 2013-10-14 10:05:43 -06:00
Ben Johnson
13b86f5360 bump(github.com/coreos/go-log/log): 2013-10-14 10:05:43 -06:00
Ben Johnson
1843f7bda5 bump(github.com/coreos/go-etcd): 0cc84e9bc81c45e074864360adc549e61a3a7f83 2013-10-14 10:05:39 -06:00
Ben Johnson
375f7a73b9 bump(github.com/coreos/go-raft): 9fed6b9e77a96f1ab3a4c02bc8dbed72fbac9eb0 2013-10-14 10:05:38 -06:00
Ben Johnson
63e128670e Fix etcd.NewClient(). 2013-10-14 09:55:57 -06:00
Amir H. Hajizamani
a0007dbeab Correct index number to match description in 'watch' example 2013-10-14 13:48:20 +01:00
Ben Johnson
259e1ce256 Merge pull request #228 from xiangli-cmu/0.2
refactor move raft http handlers to peer_server_handlers.go
2013-10-13 23:20:21 -07:00
Xiang Li
ef74464aea refactor remove extra function 2013-10-13 23:09:52 -07:00
Xiang Li
090d049b81 refactor move raft http handlers to peer_server_handlers.go 2013-10-13 22:50:51 -07:00
Xiang Li
755c18d491 Merge pull request #227 from xiangli-cmu/0.2
refactor remove the extra function
2013-10-13 22:20:52 -07:00
Xiang Li
7565313290 refactor add wrapper function 2013-10-13 22:20:23 -07:00
Xiang Li
a635f6b17c refactor remove the extra function 2013-10-13 22:13:20 -07:00
Xiang Li
2b291aabea Merge pull request #218 from benbjohnson/refactoring
[wip] Refactoring
2013-10-13 21:15:29 -07:00
Ben Johnson
dc59bd8d77 gofmt 2013-10-13 21:37:45 -06:00
Ben Johnson
0e49c49dce Remove verbosity from test. 2013-10-13 21:36:42 -06:00
Ben Johnson
1a27c9de67 Add github.com/gorilla/context. 2013-10-13 21:15:13 -06:00
Ben Johnson
8475d9878e bump(github.com/gorilla/context): 708054d61e5a2918b9f4e9700000ee611dcf03f5 2013-10-13 21:14:45 -06:00
Ben Johnson
d44fd6661a Fix registry cache issues. 2013-10-13 21:09:56 -06:00
Ben Johnson
013d07bc2a Fix server dispatch redirection. 2013-10-13 16:58:36 -06:00
Ben Johnson
77572b01f8 Merge pull request #2 from xiangli-cmu/refactoring
fix registry.go: use the correct node name; self is already in the list
2013-10-13 15:27:40 -07:00
Xiang Li
e954d3d41f fix registry.go: use the correct node name; self is already in the list 2013-10-13 15:25:07 -07:00
Ben Johnson
55c1f45805 Merge branch 'refactoring' of https://github.com/benbjohnson/etcd into refactoring
Conflicts:
	server/registry.go
2013-10-13 15:04:21 -06:00
Ben Johnson
ec24e76959 Fix duplicates in registry. 2013-10-13 14:56:17 -06:00
Ben Johnson
2b9c4bc90d Merge pull request #1 from xiangli-cmu/refactoring
fix server/server.go accept name when creating a when server; gofmt
2013-10-13 13:53:34 -07:00
Xiang Li
0c5808eeec fix server/server.go accept name when creating a when server; gofmt 2013-10-13 10:44:40 -07:00
Xiang Li
d58c4a9145 Merge pull request #224 from philips/bump-protobuf
bump(code.google.com/p/goprotobuf): 61664b8425f3
2013-10-13 10:19:13 -07:00
Brandon Philips
bd893986b2 bump(code.google.com/p/goprotobuf): 61664b8425f3 2013-10-13 10:08:40 -07:00
Ben Johnson
d3b064c2e9 Refactor v2 routes. 2013-10-13 00:29:58 -06:00
Ben Johnson
7416d2fdcc Mostly working. 2013-10-12 23:39:34 -06:00
Xiang Li
d8d712e8f0 Merge pull request #223 from xiangli-cmu/refactoring_store
refactor create do not need to check existence first
2013-10-12 21:49:23 -07:00
Xiang Li
b0793e2dd9 refactor create do not need to check existence first 2013-10-12 21:48:29 -07:00
Brandon Philips
c7d3d3371b feat(README): add go-discover 2013-10-12 21:27:20 -07:00
Ben Johnson
52b67ca307 Add gorilla/mux to third_party. 2013-10-12 20:35:10 -06:00
Ben Johnson
34b99ee343 bump(github.com/gorilla/mux): b08c5fcf14d01cb0c20ddf70157f54d4a2c3a38a 2013-10-12 20:34:31 -06:00
Ben Johnson
8670e1b7aa Refactored. 2013-10-12 15:56:43 -06:00
Ben Johnson
bb9401544a Intermediate commit. 2013-10-12 13:35:23 -06:00
Brandon Philips
ba0c104cc8 Merge pull request #215 from robszumski/update-dashboard-readme
docs(dashboard): add instructions to get started
2013-10-12 12:01:02 -07:00