Commit Graph

3000 Commits

Author SHA1 Message Date
c305eda344 docs(delete_command.go) document about recursive implies dir 2013-12-05 17:52:32 -05:00
636dad190e refactor(error.go) error messages 2013-12-05 17:50:20 -05:00
b556252358 tests fix all tests 2013-12-05 17:48:32 -05:00
4ba7d85d56 refactor(update) more clear dir checking 2013-12-05 17:16:44 -05:00
40d297be66 feat add dir_flag 2013-12-05 17:10:37 -05:00
d971d22849 Merge pull request #375 from philips/fix-reset
fix(etcd): Fix forced config reset
2013-12-05 13:26:57 -08:00
e7839e8c57 fix(etcd): Fix forced config reset
When a server name or a data directory were not provided, the
reset functionality would fail to clear out config files from
the appropriate place. This calcualtes the default server name
and data directory before reset is called.
2013-12-05 13:26:31 -08:00
af20be8123 Merge pull request #347 from benbjohnson/mod-lock
WIP: mod/lock
2013-12-05 10:59:32 -08:00
70e31c71f3 Merge pull request #371 from polvi/dockerfile
fix(Dockerfile): remove bogus -bind-addr, and use default -addr
2013-12-05 10:50:34 -08:00
b22c6fed4d fix(Dockerfile): remove bogus -bind-addr, and use default -addr 2013-12-05 18:07:51 +00:00
0867b33de5 fix(Dockerfile): reverted unneeded changes
fix(server/config.go): ensured params are changeable from config file and env
fix(server/server.go): removed unnecessary debug line
fix(server/timeout.go): removed a commented block
style(server/transporter.go): put explicit vars to replace timeout expressions
style(tests/server_utils.go): ran gofmt to clean up indenting
2013-12-05 09:23:23 +00:00
b784ced517 Update mod/lock versioning. 2013-12-04 22:39:59 -07:00
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
e76b7d1e8b Add mod/lock version. 2013-12-04 22:24:04 -07:00
f3d438a93f Add mod/lock connection monitoring. 2013-12-04 16:23:27 -07:00
618def7ab0 Merge pull request #369 from philips/format-json
fix(README): prettify json
2013-12-04 13:50:05 -08:00
7ec3f861e4 fix(README): prettify json
fixed using vim and python -m json.tool
2013-12-04 13:48:38 -08:00
67f3fc349c Merge pull request #368 from philips/cleanup-responses
fix(README): use the new response format
2013-12-04 12:22:19 -08:00
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
faab194247 Fixed test case 2013-12-04 17:39:03 +00:00
46f8a354d1 Added the ability to specify heartbeat and election timeouts as
config parameters.
2013-12-04 16:58:44 +00:00
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
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
ded3cc24c0 fix redirect url should include rawquery 2013-12-02 22:53:36 -05:00
73f04d5cec Merge pull request #343 from xiangli-cmu/refactoring_event
Refactoring event
2013-12-02 19:48:23 -08:00
c6e1af8321 merge master 2013-12-02 22:36:38 -05:00
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
d5e4aef6c2 Merge pull request #361 from philips/cleanup-peers-usage
cleanup-peers-usage
2013-12-02 19:01:18 -08:00
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
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
df20be775c Fix test harness. 2013-12-02 15:43:37 -07:00
cfb6eb6e50 Merge pull request #355 from xiangli-cmu/root_readonly
WIP fix root should be rdonly
2013-12-02 10:27:02 -08:00
e34d368a3e Merge pull request #354 from philips/fixup-prevExist-README
feat(README): add a prevExist example
2013-12-01 15:24:45 -08:00
b929e71948 tests add root readonly test 2013-12-01 18:16:32 -05:00
6252037376 fix root should be rdonly 2013-12-01 18:01:24 -05:00
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
78e382cb6b test add watcher prefix test 2013-12-01 17:35:22 -05:00
fc562bd625 fix tests bump deps 2013-12-01 17:24:30 -05:00
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
3d16633a94 update the v2 server to support recursive on CompareAndDelete events 2013-12-01 13:56:32 -07:00
d2d7e37990 implement recursive for CompareAndDelete in the store 2013-12-01 13:38:09 -07:00
f8985d731f keep the Delete tests together 2013-12-01 13:28:14 -07:00
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
cc9c75acbe fix(README): repair some noisy spaces 2013-11-30 22:46:12 -08:00
08dffe85d6 Fix spelling mistakes in internal-protocol-versioning.md 2013-12-01 08:35:56 +02:00
5097a2adee fix(event_history.go) should not scan prefix 2013-12-01 00:47:23 -05:00
373199fe46 support CreateAndDelete through the v2 server 2013-11-30 16:25:26 -07:00
171072c736 add the CompareAndDelete command 2013-11-30 16:24:23 -07:00
90a8f56c96 add compareAndDelete event action 2013-11-30 10:08:25 -07:00
5b739f6166 track CompareAndDelete stats 2013-11-30 10:05:48 -07:00