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,108 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

1108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Philips
74bd0d95b8 fix(server): try and add a expire dir test 
This doesn't actually work yet.
 2013-12-10 16:32:37 -08:00
Brandon Philips
cb9f677cf6 chore(server): cleanup some whitespace 2013-12-10 11:13:37 -08:00
Brandon Philips
9ea1ef8916 hack(travis): temporarily fix travis 
try a quick workaround for https://github.com/travis-ci/travis-ci/issues/1727
 2013-12-09 21:46:55 -08:00
Xiang Li
dd354c9e22 Merge pull request #376 from xiangli-cmu/dir_flag 
feat add dir_flag
 2013-12-09 08:34:57 -08:00
Xiang Li
59e98fcc62 doc fix grammar issue 2013-12-09 11:33:55 -05:00
Ben Johnson
8442e7a0dc Timeout refactor. 2013-12-07 14:35:31 -07:00
Ben Johnson
aabd0faebe Merge branch 'feature-parametric-timeout' of https://github.com/neildunbar/etcd into neildunbar-feature-parametric-timeout 2013-12-07 14:07:53 -07:00
Brandon Philips
31bc0bb670 Merge pull request #380 from bcwaldon/drop-prevValue 
fix(v2): Drop prevValue from exported fields
 2013-12-06 14:11:01 -08:00
Brian Waldon
0fb8fc0b8d fix(v2): Drop prevValue from exported fields 2013-12-06 11:46:23 -08:00
Neil Dunbar
a06f5e74af Merge remote-tracking branch 'upstream/master' into feature-parametric-timeout 
Conflicts:
	Dockerfile
	server/usage.go
	tests/server_utils.go
 2013-12-06 10:13:33 +00:00
Xiang Li
5edaee79e6 Merge pull request #363 from xiangli-cmu/fix_consistent_redirection 
fix redirect url should include rawquery
v0.2.0-rc2 		2013-12-05 20:33:56 -08:00
Xiang Li
0762c79e2e refactor remove unused const 2013-12-05 21:04:00 -05:00
Xiang Li
d646d7c16a tests add tests for dir flag 2013-12-05 20:46:52 -05:00
Brandon Philips
1a7eb36b6f Merge pull request #372 from philips/bind-addr-ports 
fix(server): override port of bind
 2013-12-05 15:29:37 -08:00
Brandon Philips
9db521ca04 fix(server): override port of bind 
Allow people to specify ports on the `-bind-addr` arguments so that they
can use randomly assigned port numbers in containers.
 2013-12-05 15:29:25 -08:00
Xiang Li
e00296960c test fix tests 2013-12-05 18:16:01 -05:00
Xiang Li
c305eda344 docs(delete_command.go) document about recursive implies dir 2013-12-05 17:52:32 -05:00
Xiang Li
636dad190e refactor(error.go) error messages 2013-12-05 17:50:20 -05:00
Xiang Li
b556252358 tests fix all tests 2013-12-05 17:48:32 -05:00
Xiang Li
4ba7d85d56 refactor(update) more clear dir checking 2013-12-05 17:16:44 -05:00
Xiang Li
40d297be66 feat add dir_flag 2013-12-05 17:10:37 -05:00
Brandon Philips
d971d22849 Merge pull request #375 from philips/fix-reset 
fix(etcd): Fix forced config reset
 2013-12-05 13:26:57 -08:00
Brian Waldon
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
Brandon Philips
af20be8123 Merge pull request #347 from benbjohnson/mod-lock 
WIP: mod/lock
 2013-12-05 10:59:32 -08:00
Xiang Li
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
Alex Polvi
b22c6fed4d fix(Dockerfile): remove bogus -bind-addr, and use default -addr 2013-12-05 18:07:51 +00:00
Neil Dunbar
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
Ben Johnson
b784ced517 Update mod/lock versioning. 2013-12-04 22:39:59 -07:00
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