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

1697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yicheng Qin
f3cc456385 Merge pull request #598 from unihorn/19 
fix bugs that are found in issue #579
 2014-03-01 00:30:58 -08:00
Yicheng Qin
349a802a82 chore(server): remove useless CancelWhenTimeout 
Setting request timeout is covered by go-httpclient now.
 2014-02-28 21:52:56 -08:00
Yicheng Qin
69adb78433 fix(transporter): CancelRequest doesn't work on HTTPS connections blocked 
Currently this is a workaround. And it should be fixed in Go1.3.
 2014-02-27 14:31:46 -08:00
Yicheng Qin
e99bc99dcc fix(tests/multi_node_kill_all_and_recovery): wait for cluter to build over 2014-02-27 14:31:46 -08:00
Yicheng Qin
df49265674 fix(discovery): remove its own address from peer list to join 2014-02-27 14:31:28 -08:00
Brandon Philips
e5797a54a1 fix(README): remove the drone.io badge 
the drone.io badge is either cached wrong by github or links to a wrong version when we build a branch, just remove it.
 2014-02-27 12:48:07 -08:00
Ben Johnson
a60481c6b1 Merge pull request #593 from benbjohnson/lock-fix 
fix(mod/lock): correct watch index to remove cpu load
 2014-02-26 17:34:22 -07:00
Ben Johnson
dde2b71850 fix(mod/lock): correct watch index to remove cpu load 
The waitIndex was being pulled from the wrong node in the lock parent which caused the watch to be returned immediately. This caused a continuous set of calls while a client was waiting for a lock.
 2014-02-26 17:26:25 -07:00
Ben Johnson
fddbf35df2 Add automatic node promotion / demotion. 2014-02-25 10:02:01 -07:00
Brandon Philips
23ffafefc0 Merge pull request #596 from philips/add-file-upload-docs 
feat(Documentation/api): document file upload
 2014-02-24 18:49:11 -08:00
Ben Johnson
f5698d3566 Proxy promotion. 2014-02-24 17:01:04 -07:00
Brandon Philips
02a053a4b8 feat(Documentation/api): document file upload 
This gets asked about a lot int IRC/mailinglist/etc. Fixes this issue:
https://github.com/coreos/etcd/issues/383#issuecomment-31183603
 2014-02-23 10:17:05 -08:00
Brandon Philips
4c17dc3431 Merge pull request #592 from Plasma/patch-1 
Trivial formatting correction
 2014-02-22 18:49:57 -08:00
Andrew Armstrong
e6e6f7d8d0 Trivial formatting correction 2014-02-23 12:48:35 +11:00
Ben Johnson
1d961b8e56 Add proxy mode. 2014-02-22 15:02:20 -07:00
Brandon Philips
f922a08a27 Merge pull request #586 from wereHamster/patch-1 
docs: Add links to haskell bindings and scrz project
 2014-02-21 10:03:35 -08:00
Brandon Philips
7289224af9 Merge pull request #585 from philips/document-consistent 
feat(Documentation): add a section on consistent reads
 2014-02-21 09:40:47 -08:00
Brandon Philips
035bbc6913 feat(Documentation): add a section on consistent reads 
We have waited too long to document `consistent=true`. Document it!
 2014-02-21 09:39:54 -08:00
Tomas Carnecky
ae8d416c57 Add links to haskell bindings and scrz project 2014-02-21 02:59:38 +00:00
Yicheng Qin
46d817f91b Merge pull request #577 from unihorn/6 
chore: rename 'heartbeat timeout' to 'heartbeat interval'
 2014-02-18 17:11:31 -08:00
Yicheng Qin
f434177a9a chore: rename 'heartbeat timeout' to 'heartbeat interval' 
Heartbeat timeout means the period length that indicates heartbeat is
out of service, which is different from heartbeat interval.

So we should use '-peer-heartbeat-interval' instead of
'-peer-heartbeat-timeout' in etcd.

'-peer-heartbeat-timeout' is deprecated but still could be used.
 2014-02-18 16:37:20 -08: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