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

1534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Johnson
3cd83c61c4 Fix PUT /config response and log errors. 2014-03-06 13:35:46 -07:00
Ben Johnson
fe4dee03ab Minor fixes. 2014-03-04 09:29:44 -07:00
Ben Johnson
c3b4afc139 Fix JoinCommand comment. 2014-03-04 08:56:10 -07:00
Ben Johnson
063f3b574c Check for peer before demotion. 2014-03-04 08:53:13 -07:00
Ben Johnson
c8d6b26dfd Add auto-demotion after peer inactivity. 2014-03-03 11:15:05 -07:00
Ben Johnson
fddbf35df2 Add automatic node promotion / demotion. 2014-02-25 10:02:01 -07:00
Ben Johnson
f5698d3566 Proxy promotion. 2014-02-24 17:01:04 -07:00
Ben Johnson
1d961b8e56 Add proxy mode. 2014-02-22 15:02:20 -07:00
Brandon Philips
8485987b74 Merge pull request #524 from yifan-gu/remove_omitempty_on_value 
remove omitempty on value
 2014-02-18 07:08:00 -08:00
evan-gu
9cfd8c5f0b fix(store): make NodeExtern.Value a *string 
Before this change if the value of a Node was "" it would get dropped from the json
encoding and the Node.Value field would be missing. Fix this problem by making
NodeExtern.Value a *string so that an empty string will be encoded but a nil value
will drop the field.
 2014-02-18 00:50:44 -05:00
Yicheng Qin
04f21b5976 Merge pull request #569 from unihorn/5 
Ordering and functionality of `-discovery` `-peers` and data dir to find peers
 2014-02-17 14:34:53 -08:00
Yicheng Qin
cf38910601 docs: boot order to find peers 2014-02-17 14:17:14 -08:00
Yicheng Qin
3a4df1612c feat(discovery): adjust boot order to find peers 
The boot order for peers is -discovery, -peers, log data, forming
new cluster itself.

Special rules:
1. If discovery succeeds, it would find peers specified by discover URL
only.
2. Etcd would fail when meeting bad -discovery, no -peers and log data.

Add TestDiscoveryDownNoBackupPeersWithDataDir as the test.
 2014-02-17 12:53:39 -08:00
Yicheng Qin
bd56b15b6e fix(tests/discovery): use host as -peers parameter instead of url 
Or it cannot test the functionality correctly.
Moreover, add TestDiscoveryNoWithBackupPeers as the test for it.
 2014-02-14 18:23:41 -08:00
Brandon Philips
a72f913a60 fix(tests/functional): some squashing mistakes in PR merge 
accidental squash mistake in the last PR that was merged caused a
function to be renamed but not it's caller.
 2014-02-14 18:17:30 -08:00
Brandon Philips
7599a285c3 Merge pull request #574 from unihorn/6 
Fix the bug that TestSimpleMultiNodeTls may error sometimes
 2014-02-14 18:08:01 -08:00
Yicheng Qin
efdc741e5c feat(tests/util): wait until server is up when creating cluster 
Wait until server is up instead of for some time
 2014-02-14 18:06:43 -08:00
Xiang Li
93a02b619e Merge pull request #573 from cenkalti/stream-bug 
Store: Fix slow consumer bug
 2014-02-14 20:46:37 -05:00
Yicheng Qin
e69118ade7 chore(tests/multi_node_kill_one): check function-call result 
To stop test in time if error occurs
 2014-02-14 17:36:11 -08:00
Cenk Alti
8bed1e1f15 fix(store/watch): fix the slow consumer bug 2014-02-14 16:52:40 -08:00
Cenk Alti
e73e61f238 test(store/watch): add test case for slow event consumers 2014-02-14 16:12:53 -08:00
Ed Rooth
9247486576 Merge pull request #568 from pjjw/fix-dash 
Fix directory browsing in dashboard
 2014-02-14 14:41:29 -08:00
Long Nguyen
1cc60df5f3 fix(Documentation): example of discovery in conf and env vars 2014-02-14 08:59:17 -08:00
Rob Szumski
b85eb2a44c feat(README): link to raft homepage 2014-02-13 21:58:39 -08:00
Peter Woodman
5de1caf057 Fix directory browsing in dashboard 2014-02-13 22:42:21 -05:00
Laust Rud Jacobsen
be069d5918 fix(Documentation/tuning): fix incorrect comment about snapshot 2014-02-13 13:54:09 -08:00
Yicheng Qin
bb911e6ab8 Merge pull request #566 from unihorn/3 
chore(test): remove useless node1.etcd dir
 2014-02-13 10:01:58 -08:00
Yicheng Qin
7ad2dadabf chore(test): remove useless node1.etcd dir 
It is a directory checked in from an etcd test run in mistake.
 2014-02-13 08:52:16 -08:00
Brandon Philips
98396e8367 Merge pull request #565 from philips/cleanup-version 
fix(etcd): get consistent with etcdctl on printing versions
 2014-02-13 07:59:27 -08:00
Brandon Philips
fccecd4a05 fix(etcd): get consistent with etcdctl on printing versions 
Lets get a bit more consistent in printing the versions:

```
$ ./bin/etcd -version
etcd version 0.3.0+git
$ ./bin/etcdctl -v
etcdctl version 0.3.0+git
```
 2014-02-13 07:54:44 -08:00
Brandon Philips
db1b53fde7 chore(server): add +git to the version 
we need to automate this but make sure versions built from git have
+git after the version number.
 2014-02-12 22:02:00 -08:00
Ben Johnson
c423f38700 Merge pull request #563 from benbjohnson/raft 
bump(github.com/coreos/raft): cff0a00
 2014-02-11 16:34:50 -07:00
Ben Johnson
193fe2df71 bump(github.com/coreos/raft): cff0a00 2014-02-11 16:09:04 -07:00
Brandon Philips
6f14467383 Merge pull request #559 from philips/document-missing-stats 
fix(Documentation): single machine clusters have some stats undefined
 2014-02-11 10:17:45 -08:00
Brandon Philips
7015214fbb Merge pull request #554 from mfischer-zd/tls_fixes 
fix(server/tls_info): use all certificates in CA file
 2014-02-11 10:17:33 -08:00
Michael S. Fischer
e1af3dbde6 fix(server/tls_info): use all certificates in CA file 
fixes coreos/etcd#553
 2014-02-10 22:31:22 -08:00
Michael Marineau
040c1f591e Merge pull request #560 from marineam/test-v1 
add(server/v1/tests): Port many of the v2 HTTP handler tests to v1
 2014-02-10 22:29:35 -08:00
Michael Marineau
f206db2cee add(server/v1/tests): Port many of the v2 HTTP handler tests to v1 
This should cover most aspects of the v1 API but being new to the etcd
code base I cannot promise that or that the tests are even correct.
They do pass though :)
 2014-02-10 22:18:06 -08:00
Brandon Philips
ba8e5d7add fix(Documentation): single machine clusters have some stats undefined 
document that single machine clusters will omit sendBandwidthRate and
sendPkgRate.

Via http://thread.gmane.org/gmane.comp.distributed.etcd/218
 2014-02-10 21:58:09 -08:00
Brandon Philips
ac5e35101c Merge pull request #558 from philips/v1-put-crash-fix 
fix(server/v1): don't fail put on new v1 key
 2014-02-10 19:57:00 -08:00
Brandon Philips
68383b1293 fix(server/v1): don't fail put on new v1 key 
We weren't checking for PrevNode being nil in the v1 code path. Do this
and add a test.

Fixes #557
 2014-02-10 18:59:56 -08:00
Ben Johnson
137f87c414 Merge branch 'mod-lock-fixes' of https://github.com/nabeken/etcd into nabeken-mod-lock-fixes 
Conflicts:
	mod/lock/v2/acquire_handler.go
 2014-02-10 08:05:57 -07:00
Brian Waldon
f5be7c9136 Merge pull request #551 from bcwaldon/doc-compareAndDelete 
Document CompareAndDelete
 2014-02-09 15:29:24 -08:00
Brandon Philips
a00bf38f16 feat(scripts): use zip for windows and darwin 
zip files are more common on OSX and windows. Use those file formats for
those two platforms.
 2014-02-09 12:11:14 -08:00
Brandon Philips
c34a2b85ed Merge pull request #550 from badboy/patch-1 
Change token example to use returned value only
 2014-02-08 09:22:45 -08:00
Brian Waldon
60a2709213 chore(gofmt): gofmt compare_and_delete_command.go 2014-02-08 07:28:16 -08:00
Brian Waldon
1fcbc83503 doc(CompareAndSwap): clarify prevIndex in CAS 2014-02-08 07:27:59 -08:00
Brian Waldon
08818886b2 doc(CompareAndDelete): Add missing CAD docs 
Fixes issue #549
 2014-02-08 07:27:33 -08:00
Jan-Erik Rediger
c6910a96de Change token example to use returned value only 
The discovery.etcd.io/new already returns a complete URL containing the host, so there is no need to specify it on the command line.
 2014-02-08 09:58:24 +01:00
Brandon Philips
86546c68b4 fix(README): move contact closer to contributing 2014-02-07 18:23:26 -08:00