6838 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
Neil Dunbar	faab194247	Fixed test case	2013-12-04 17:39:03 +00:00
Neil Dunbar	46f8a354d1	Added the ability to specify heartbeat and election timeouts as ... config parameters.	2013-12-04 16:58:44 +00: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	ded3cc24c0	fix redirect url should include rawquery	2013-12-02 22:53:36 -05: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
rick	3d16633a94	update the v2 server to support recursive on CompareAndDelete events	2013-12-01 13:56:32 -07:00
rick	d2d7e37990	implement recursive for CompareAndDelete in the store	2013-12-01 13:38:09 -07:00
rick	f8985d731f	keep the Delete tests together	2013-12-01 13:28:14 -07: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
rick	373199fe46	support CreateAndDelete through the v2 server	2013-11-30 16:25:26 -07:00
rick	171072c736	add the CompareAndDelete command	2013-11-30 16:24:23 -07:00
rick	90a8f56c96	add compareAndDelete event action	2013-11-30 10:08:25 -07:00
rick	5b739f6166	track CompareAndDelete stats	2013-11-30 10:05:48 -07:00
rick	702cf1cc36	teach store.Store about CompareAndDelete	2013-11-30 10:02:03 -07: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