Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,077 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

1077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Johnson
5d865e321c Merge branch 'master' of https://github.com/coreos/etcd into mod-lock 
Conflicts:
	server/v2/tests/delete_handler_test.go
	server/v2/tests/get_handler_test.go
	server/v2/tests/post_handler_test.go
	server/v2/tests/put_handler_test.go
	third_party/github.com/coreos/go-etcd/etcd/requests.go
 2013-12-04 22:36:53 -07:00
Ben Johnson
e76b7d1e8b Add mod/lock version. 2013-12-04 22:24:04 -07:00
Ben Johnson
f3d438a93f Add mod/lock connection monitoring. 2013-12-04 16:23:27 -07:00
Brandon Philips
618def7ab0 Merge pull request #369 from philips/format-json 
fix(README): prettify json
 2013-12-04 13:50:05 -08:00
Brandon Philips
7ec3f861e4 fix(README): prettify json 
fixed using vim and python -m json.tool
 2013-12-04 13:48:38 -08:00
Brandon Philips
67f3fc349c Merge pull request #368 from philips/cleanup-responses 
fix(README): use the new response format
 2013-12-04 12:22:19 -08:00
Brandon Philips
0dc428b5d6 fix(README): use the new response format 
update all of the examples to use the new response format.
 2013-12-04 12:06:41 -08:00
Brandon Philips
e4f1e22401 Merge pull request #357 from philips/add-osx-curl-note 
chore(README): add note about curl on OSX
 2013-12-03 22:35:55 -08:00
Brandon Philips
aa4660d780 chore(README): add note about curl on OSX 
Discussion about this issue here:
https://groups.google.com/forum/#!topic/munki-dev/oX2xUnoQEi4
 2013-12-03 22:35:13 -08:00
Xiang Li
73f04d5cec Merge pull request #343 from xiangli-cmu/refactoring_event 
Refactoring event
 2013-12-02 19:48:23 -08:00
Xiang Li
c6e1af8321 merge master 2013-12-02 22:36:38 -05:00
Xiang Li
7875ba28c9 Merge pull request #360 from philips/fix-peerurl 
fix(server/v2): redirect to ClientURL not PeerURL
 2013-12-02 19:02:58 -08:00
Xiang Li
d5e4aef6c2 Merge pull request #361 from philips/cleanup-peers-usage 
cleanup-peers-usage
 2013-12-02 19:01:18 -08:00
Brandon Philips
6729776e25 fix(server/usage): fixup the usage based on feedback 
People were getting confused by the lack of explanation on which port to
use. Fix this.

/cc @polvi
 2013-12-02 18:41:03 -08:00
Brandon Philips
72bf216cb4 fix(server/v2): redirect to ClientURL not PeerURL 
If consistent is set you must redirect the client to the leader's
ClientURL not the PeerURL.
 2013-12-02 18:20:11 -08:00
Ben Johnson
df20be775c Fix test harness. 2013-12-02 15:43:37 -07:00
Xiang Li
cfb6eb6e50 Merge pull request #355 from xiangli-cmu/root_readonly 
WIP fix root should be rdonly
 2013-12-02 10:27:02 -08:00
Xiang Li
e34d368a3e Merge pull request #354 from philips/fixup-prevExist-README 
feat(README): add a prevExist example
 2013-12-01 15:24:45 -08:00
Xiang Li
b929e71948 tests add root readonly test 2013-12-01 18:16:32 -05:00
Xiang Li
6252037376 fix root should be rdonly 2013-12-01 18:01:24 -05:00
Xiang Li
577d08ea7d Merge pull request #352 from xiangli-cmu/fix_watch_prefix 
fix(event_history.go) should not scan prefix
 2013-12-01 14:40:15 -08:00
Xiang Li
78e382cb6b test add watcher prefix test 2013-12-01 17:35:22 -05:00
Xiang Li
fc562bd625 fix tests bump deps 2013-12-01 17:24:30 -05:00
Brandon Philips
1d02a70802 feat(README): add a prevExist example 
On the mailing list Dustin Oprea suggested adding a prevExist concrete
example would make it more clear that the value must be true or false.
 2013-12-01 13:28:08 -08:00
Xiang Li
ff081dca88 Merge pull request #353 from baruch/patch-1 
Fix spelling mistakes in internal-protocol-versioning.md
 2013-12-01 08:52:13 -08:00
Brandon Philips
cc9c75acbe fix(README): repair some noisy spaces 2013-11-30 22:46:12 -08:00
Baruch Even
08dffe85d6 Fix spelling mistakes in internal-protocol-versioning.md 2013-12-01 08:35:56 +02:00
Xiang Li
5097a2adee fix(event_history.go) should not scan prefix 2013-12-01 00:47:23 -05:00
Brandon Philips
7997fdc76f Merge pull request #330 from philips/fixup-readme-remove-v1 
fix(README): fix 9 instances of v1
 2013-11-29 22:28:02 -08:00
Brandon Philips
2a5030b3ca fix(README): fix 9 instances of v1 
remove references to the v1 API and consistently use the v2 API.
 2013-11-29 22:26:52 -08:00
Brandon Philips
d5172849bc Merge pull request #342 from philips/use-machine-nomenclature 
fix(README): use machine instead of node
 2013-11-29 16:57:28 -08:00
Ben Johnson
03571d3cda Merge branch 'master' of https://github.com/coreos/etcd into mod-lock 2013-11-29 16:34:04 -07:00
Ben Johnson
d8e9838c38 Lock testing. 2013-11-29 16:33:49 -07:00
Xiang Li
67b4c27d5d refactor change node_repr to node_extern 2013-11-28 21:34:38 -05:00
Xiang Li
b7d07ea5c8 refactor event 2013-11-28 11:33:40 -05:00
Xiang Li
08c59895b5 refactor(Node) do not expose node struct 2013-11-28 11:33:23 -05:00
Ben Johnson
22c2935ddb Initial mod_lock acquire. 2013-11-27 16:59:05 -07:00
Brandon Philips
978cb54fc7 fix(README): use machine instead of node 
Internally we call every member of an etcd cluster a "machine" so stay
consistent when talking in the README.
 2013-11-27 14:37:31 -08:00
Brandon Philips
d3a83805cc fix(README): link to etcdctl directly 
link to the etcdctl homepage directly
 2013-11-27 14:29:41 -08:00
Brandon Philips
e41b86fd68 Merge pull request #341 from philips/fixup-name-and-data-dir-guessing 
fix(etcd): fixup the name and data dir guessing
 2013-11-27 14:26:02 -08:00
Ben Johnson
74ad50efa6 Merge branch 'master' of https://github.com/coreos/etcd into mod-lock 
Conflicts:
	mod/mod.go
 2013-11-27 14:47:13 -07:00
Ben Johnson
32861246b9 mod/lock 2013-11-27 14:36:14 -07:00
Xiang Li
0344e759d9 Merge pull request #340 from philips/add-rthomas-clj-etcd 
feat(README): add clojure client rthomas/clj-etcd
 2013-11-27 12:25:28 -08:00
Brandon Philips
04711ecde5 fix(etcd): fixup the name and data dir guessing 
- Only generate the name from a hostname if the data dir is not
  specified and the name is not specified

- Only guess the data dir from Name if the data dir wasn't already
  specified
 2013-11-27 12:20:26 -08:00
Brandon Philips
da666d9143 feat(README): add clojure client rthomas/clj-etcd 2013-11-27 09:11:00 -06:00
Brandon Philips
c93f086032 Merge pull request #329 from philips/remove-redundant-datadir-code 
fix(etcd): remove duplicate DataDir setup
 2013-11-26 13:20:29 -08:00
Brandon Philips
7c07810958 fix(etcd): remove duplicate DataDir setup 
In the refactor of the configuration and flags I think that we
accidently placed this logic twice. The side effect is that we always
ended up with a `.etcd` directory.
 2013-11-26 10:22:39 -06:00
Brandon Philips
0ed3509ec1 Merge pull request #324 from philips/redirect-mod-dashboard-trailing-slash 
fix(mod): redirect dashboard to /dashboard
 2013-11-26 08:15:33 -08:00
Brandon Philips
64e49726cd fix(mod): redirect dashboard to /dashboard 2013-11-23 23:31:28 -08:00
Xiang Li
b4f3d02c1c Merge pull request #322 from xiangli-cmu/master 
bump deps
 2013-11-22 14:18:17 -08:00