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

1043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Johnson
df20be775c Fix test harness. 2013-12-02 15:43:37 -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
Ben Johnson
d8e9838c38 Lock testing. 2013-11-29 16:33:49 -07:00
Ben Johnson
22c2935ddb Initial mod_lock acquire. 2013-11-27 16:59:05 -07: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
Xiang Li
a607c9eace fix dep issue 2013-11-22 13:27:04 -08:00
Brandon Philips
4520705bdf Merge pull request #320 from philips/add-cors-options 
feat(server): introduce a cors handler
 2013-11-22 11:53:45 -08:00
Xiang Li
40a574a8ca wip commit 2013-11-22 11:32:24 -08:00
Xiang Li
522a833ab2 bump go-etcd 2013-11-22 11:31:46 -08:00
Xiang Li
8a0496cfae bump deps 2013-11-22 08:59:24 -08:00
Brandon Philips
b190c4250a chore(mod/dashboard/resources): use the latest version of the code 2013-11-21 17:23:40 -08:00
Brandon Philips
4c06e19cf2 fix(mod/dashboard): grab the leader URL 
query etcd to find the URL of the leader before making any http requests
that can't be redirected from a browser like PUT/POST and DELETE.
 2013-11-21 17:12:58 -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
68e7455374 Merge pull request #317 from benbjohnson/fix-help-flag 
Config clean up and usage messaging.
 2013-11-20 10:35:55 -08:00
Ben Johnson
ea6b11bbf6 Config clean up and usage messaging. 2013-11-20 10:52:01 -07:00
Ben Johnson
228754a99c mod_lock 2013-11-19 16:12:58 -07:00
Ben Johnson
fca8506331 Merge pull request #312 from benbjohnson/clean-up-config 
Renamed Configuration Parameters
 2013-11-19 13:49:40 -08: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
Ben Johnson
8952c1bd42 Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config 
Conflicts:
	etcd.go
 2013-11-19 08:28:46 -07:00
Xiang Li
01a0f79efb Merge pull request #314 from xiangli-cmu/fix-content-type 
fix set content-type to application/json
 2013-11-16 20:50:36 -08: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
Xiang Li
48f5a47ff1 Merge pull request #310 from xiangli-cmu/master 
test fix wrong assumption should be previous index + 501 + 6
 2013-11-14 20:20:57 -08:00
Xiang Li
4f45de6953 test fix wrong assumption should be previous index + 501 + 6 2013-11-14 20:22:25 -08:00
Xiang Li
1c1d3dd708 Merge pull request #309 from xiangli-cmu/master 
fix create folder before write info file
 2013-11-14 20:11:22 -08:00
Xiang Li
e90937a2b4 tests loosen the ttl checking 2013-11-14 20:09:12 -08:00
Xiang Li
516f249403 fix create folder before write info file 2013-11-14 20:00:44 -08:00
Brandon Philips
3ce1132d5c Merge pull request #305 from philips/cherry-pick-lost-changes 
feat(README): add an erlang library marshall-lee/etcd.erl
 2013-11-13 20:44:31 -08:00
Brandon Philips
39e4e0c3d9 feat(README): add an erlang library marshall-lee/etcd.erl 2013-11-13 20:39:40 -08:00
Brandon Philips
5747b3b401 fix(README): cleanup a bad merge 2013-11-13 20:37:46 -08:00
Ben Johnson
f499100426 Merge branch 'master' of https://github.com/benbjohnson/etcd into benbjohnson-master 
Conflicts:
	README.md
v0.2.0-rc1 		2013-11-13 22:38:06 -05:00
Ben Johnson
aa047b124d v0.2.0-rc1 2013-11-13 22:34:13 -05:00
Ben Johnson
256a0428dd CHANGELOG 2013-11-13 21:56:02 -05:00
Xiang Li
d9c7796d56 Merge pull request #303 from philips/fixup-certificates 
fix(fixtures/ca): make the certificates work
 2013-11-13 11:56:36 -08:00
Brandon Philips
b3704a7119 fix(fixtures/ca): make the certificates work 
Something was wrong with the old certificates. Rebuild them to get them
all working.
 2013-11-13 11:45:20 -08: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
6066862c34 Merge pull request #299 from benbjohnson/release 
README
 2013-11-13 11:22:31 -08:00
Ben Johnson
a0bfe411f8 Merge pull request #298 from benbjohnson/migration-test 
Migration test
 2013-11-13 10:19:33 -08:00