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

166 Commits

Author SHA1 Message Date
Xiang Li
5edaee79e6 Merge pull request #363 from xiangli-cmu/fix_consistent_redirection 
fix redirect url should include rawquery
 2013-12-05 20:33:56 -08: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
b556252358 tests fix all tests 2013-12-05 17:48:32 -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
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
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
Neil Dunbar
46f8a354d1 Added the ability to specify heartbeat and election timeouts as 
config parameters.
 2013-12-04 16:58:44 +00:00
Xiang Li
ded3cc24c0 fix redirect url should include rawquery 2013-12-02 22:53:36 -05: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
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
fc562bd625 fix tests bump deps 2013-12-01 17:24:30 -05:00
rick
3d16633a94 update the v2 server to support recursive on CompareAndDelete events 2013-12-01 13:56:32 -07:00
rick
373199fe46 support CreateAndDelete through the v2 server 2013-11-30 16:25:26 -07:00
Ben Johnson
03571d3cda Merge branch 'master' of https://github.com/coreos/etcd into mod-lock 2013-11-29 16:34:04 -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
Ben Johnson
22c2935ddb Initial mod_lock acquire. 2013-11-27 16:59:05 -07: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
Xiang Li
b4f3d02c1c Merge pull request #322 from xiangli-cmu/master 
bump deps
 2013-11-22 14:18:17 -08:00
Xiang Li
a607c9eace fix dep issue 2013-11-22 13:27:04 -08:00
Xiang Li
8a0496cfae bump deps 2013-11-22 08:59:24 -08:00
Brandon Philips
a1ec895b91 feat(server): introduce a cors handler 
Introduce a handler that lives under the gorilla mux and adds the
correct headers based on the request and always returns 200 OK when
there OPTIONS is called on a URL.

This fixes the ability to DELETE from the dashboard on peer X when peer
Y is the leader. As a side effect it reveals some bugs in the dashboard
though notably:

- Due to the RTT immediatly refreshing the dashboard doesn't work and
  deleted keys are still there

- For some reason PUTS from peer X are creating directories and not
  keys.
 2013-11-21 09:25:21 -08:00
Ben Johnson
ea6b11bbf6 Config clean up and usage messaging. 2013-11-20 10:52:01 -07:00
Ben Johnson
15eee885d7 Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config 2013-11-19 10:13:39 -07:00
Ben Johnson
a414b15f9a Config fixes. 2013-11-19 09:20:20 -07:00
Xiang Li
1d34c82643 fix set content-type to application/json 2013-11-16 20:48:44 -08:00
Ben Johnson
cba2611c68 Renamed configuration parameters. 2013-11-15 00:13:32 -05:00
Brandon Philips
a5402435b9 Merge pull request #301 from philips/use-directory-based-on-machine-name 
feat(etcd): create unique directory on no-flag case
 2013-11-13 11:23:19 -08:00
Brandon Philips
eecd9f7e35 feat(etcd): create unique directory on no-flag case 
Tell etcd to store the log and configuration into directory in the
pattern of `${machineName}.etcd` if no directory is specified.
 2013-11-13 10:16:02 -08:00
Brandon Philips
ca7e61052d refactor(mod): remove the /etcd/ prefix 
Originally we were going to move all of the API endpoints to /etcd/ so
that you could move etcd traffic over a multiplexed HTTP proxy with
other service but since we don't have a strong use case for this just
remove this for now.
 2013-11-13 06:15:35 -08:00
Xiang Li
5abbaf59e3 Merge pull request #292 from xiangli-cmu/fix-ttl 
WIP: fix ttl
 2013-11-11 21:30:32 -08:00
Xiang Li
06f1b7f2e8 refactor change Index to modifiedIndex 2013-11-09 20:49:19 -08:00
Xiang Li
d8e5994c35 feat attach etcd-index,raft-index,raft-term to header 2013-11-09 20:20:47 -08:00
Xiang Li
6156d5c790 refactor separate etcd index from raft index 2013-11-09 17:55:54 -08:00
Brandon Philips
5620f88635 feat(server): insert the mod path 2013-11-08 16:59:30 -08:00
Xiang Li
0372cdea23 refactor move sync command into etcd 2013-11-08 16:00:58 -08:00
Brandon Philips
6a074d4f6f chore(*.go): add copyright notice 2013-11-08 14:04:15 -08:00
Xiang Li
5a4e764d7a refactor add comments for receiving expire commands 2013-11-08 13:24:23 -08:00
Xiang Li
b4f4528ef4 feat upgrade get_handler 2013-11-07 22:29:15 -08:00
Xiang Li
28ac516f68 fix sinceIndex 2013-11-07 20:55:26 -08:00
Xiang Li
51f57629f9 Merge pull request #281 from xiangli-cmu/fix-snapshot 
fix snapshot
 2013-11-03 21:10:53 -08:00
Xiang Li
235ffc234d refactor change cmd argument snapCount to snapshotCount 2013-11-03 21:06:51 -08:00