Xiang Li
9b6fcfffb6
*: replace our own metrics with codahale/metrics
2015-02-28 10:11:53 -08:00
Xiang Li
33afbfead6
etcdserver: remove the dep on metrics. first step towards removing metrics pkg from etcd.
2015-02-28 10:09:55 -08:00
Yicheng Qin
feaabde125
Godeps: bump golang.org/x/net/context to b8c11bbe
2015-02-28 10:09:55 -08:00
Xiang Li
cbef6ab152
raft: clean up storage
2015-02-28 10:09:07 -08:00
ravigadde
8fb6eb6c70
Update libraries-and-tools.md
...
Added a distributed r/w lock in addition to the master election implementation.
2015-02-28 10:09:07 -08:00
Xiang Li
5ede18be74
raft: separate compact and createsnap in memory storage
2015-02-28 10:08:30 -08:00
Yicheng Qin
cea3448438
*: bump to v2.0.4+git
2015-02-27 12:25:50 -08:00
Yicheng Qin
1a2c6d3f2f
*: bump to v2.0.4
2015-02-26 22:01:24 -08:00
Xiang Li
ecf7c27697
Merge pull request #2374 from wellbehavedsoftware/fix-2373
...
etcdtcl: fix etcdctl cluster-health ignores SSL settings
2015-02-25 07:44:10 -08:00
James Pharaoh
05ecdbc617
etcdtcl: fix etcdctl cluster-health ignores SSL settings
...
etcdctl reconnects to the leader, but was not picking up ssl settings in this
case, which causes it to show unhealthy when this is not the case.
Fixes #2373
2015-02-25 13:19:07 +01:00
Yicheng Qin
6648b7e302
Merge pull request #2363 from yichengq/329
...
migrate/starter: fix v2 data dir checking
2015-02-24 22:44:10 -08:00
Yicheng Qin
194105e02c
Merge pull request #2369 from jonsyu1/master
...
Documentation fixes for proxy
2015-02-24 21:39:20 -08:00
Jonathan Yu
31bfffaa48
Documentation: standardize on url over URL
...
url and URL both appear in this doc. Choose url due to higher frequency
2015-02-24 16:26:27 -05:00
Jonathan Yu
1fbaf9dbb7
Documentation: fix discovery flag for proxy docs
...
It seems that the -discovery flag used to be -discovery-url. Updated this to use
the currently documented and supported -discovery flag.
2015-02-24 16:25:18 -05:00
Yicheng Qin
3fd9136740
migrate/starter: fix v2 data dir checking
2015-02-24 11:47:56 -08:00
Xiang Li
a560c52815
Merge pull request #2354 from xiang90/wait_time
...
pkg/wait: add WaitTime
2015-02-23 14:29:39 -08:00
Xiang Li
53d20a8a29
pkg/wait: add WaitTime
...
WaitTime waits on deadline instead of id.
2015-02-23 14:26:42 -08:00
Xiang Li
4b72095bd3
Merge pull request #2350 from jonsyu1/master
...
Fixed sample command flags in proxy docs
2015-02-23 09:19:15 -08:00
Jonathan Yu
28e150e50e
Documentation: fix sample command flags for proxy
...
The docs mention the listen-client-urls flag, but the examples use
client-listen-urls, which is an invalid flag.
2015-02-23 11:15:42 -05:00
Xiang Li
4d0472029a
Merge pull request #2348 from yichengq/326
...
etcdserver: fix cluster fallback recovery
2015-02-21 12:16:08 -08:00
Yicheng Qin
e54fdfd9cc
Merge pull request #2349 from yichengq/327
...
rafthttp: fix panic on receiving empty ents
2015-02-20 15:15:43 -08:00
Yicheng Qin
ca390560f9
rafthttp: fix panic on receiving empty ents
...
2.0 rc may send empty ents. Fix it for backward compatibility.
2015-02-20 15:07:27 -08:00
Yicheng Qin
cff005777a
etcdserver: fix cluster fallback recovery
...
Cluster and transport may recover to old states when new node joins
the cluster. Record cluster last modified index to avoid this.
2015-02-20 14:30:00 -08:00
Barak Michener
d57e07dcde
Merge pull request #2347 from bdarnell/fix-nyet-test
...
Fix test for existence of go-nyet.
2015-02-20 14:07:55 -05:00
Ben Darnell
79bc3f4774
Fix test for existence of go-nyet.
...
When the file is not found, `which` returns an empty string,
which passes the -f test. `command -v` is the most portable alternative
to `which` per
http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212
2015-02-20 14:02:43 -05:00
Xiang Li
d2b0dd2419
Merge pull request #2345 from bdarnell/normal-entry-formatter
...
Only use the EntryFormatter for normal entries.
2015-02-20 11:00:12 -08:00
Ben Darnell
b53dc0826e
Only use the EntryFormatter for normal entries.
...
ConfChange entries also have a Data field but the application-supplied
formatter won't know what to do with them.
2015-02-20 13:51:14 -05:00
Xiang Li
0ea2173a7e
Merge pull request #2343 from xiang90/fix_kill
...
osutil: pid 1 should exit directly instead of trying to kill itself
2015-02-20 09:01:49 -08:00
Xiang Li
7ae94f2bf0
osutil: pid 1 should exit directly instead of trying to kill itself
2015-02-19 20:27:50 -08:00
Yicheng Qin
4228c703a7
Merge pull request #2341 from yichengq/326
...
migrate/starter: fix flag parsing
2015-02-19 11:02:07 -08:00
Yicheng Qin
10629c40e1
migrate/starter: fix flag parsing
2015-02-18 23:47:52 -08:00
Xiang Li
e2928cd97a
Merge pull request #2242 from barakmich/acl_doc
...
docs: Add v2 ACL RFC
2015-02-18 23:31:26 -08:00
Barak Michener
40365c4f8d
docs: add Security RFC
...
docs: Add v2 ACL RFC
Add workflow, fix terminology, make the API JSON, and general cleanup
fixes from xiang90s comments
add permissions struct
update regarding glob matches
rename file
2015-02-18 14:34:00 -05:00
Xiang Li
88994f9ec8
Merge pull request #2335 from xiang90/dump-tool
...
tool: dump tool supports index
2015-02-18 09:35:49 -08:00
Xiang Li
d6f8a30f7c
tool: dump tool supports index
2015-02-18 09:13:47 -08:00
Barak Michener
7c65857283
Merge pull request #2327 from barakmich/remove_shadowing
...
*: remove shadowing of variables from etcd and add travis test
2015-02-17 17:46:41 -05:00
Barak Michener
92dca0af0f
*: remove shadowing of variables from etcd and add travis test
...
We've been bitten by this enough times that I wrote a tool so that
it never happens again.
2015-02-17 16:31:42 -05:00
Xiang Li
0a5707420b
Merge pull request #2326 from yichengq/325
...
migrate/functional: fix `go build` failure
2015-02-17 10:46:39 -08:00
Yicheng Qin
90b06f874d
migrate/functional: fix go build failure
2015-02-17 10:35:30 -08:00
Kelsey Hightower
66199afb25
Merge pull request #2322 from kelseyhightower/add-etcd-docker-guide
...
doc: add etcd docker guide
2015-02-16 12:43:17 -08:00
Kelsey Hightower
217a1f0730
doc: add etcd docker guide
...
Fixes #2253
2015-02-16 11:44:41 -08:00
Xiang Li
def62071f0
Merge pull request #2320 from xiang90/fix_error
...
etcdserver: fix error message when valide the discovery cluster
2015-02-16 09:53:24 -08:00
Xiang Li
beb44ef6ba
etcdserver: fix error message when valide the discovery cluster
2015-02-16 09:53:01 -08:00
Xiang Li
d1ed54b734
Merge pull request #2317 from zhangbaitong/master
...
docs:small fix
2015-02-16 08:28:37 -08:00
zhangbaitong
518eb9fa2f
docs:small fix
...
Signed-off-by: zhangbaitong <zhangbaitong@163.com>
2015-02-16 17:54:24 +08:00
Xiang Li
73e67628d9
Merge pull request #2313 from xiang90/cluster_mu
...
etcdserver: move the mutex before what it guards
2015-02-14 23:05:53 -08:00
Xiang Li
04bd06d20b
etcdserver: move the mutex before what it guards
2015-02-14 22:26:12 -08:00
Xiang Li
29f05bb217
Merge pull request #2307 from xiang90/refactor_cluster
...
etcdserver: getOtherPeerURLs -> getRemotePeerURLs
2015-02-14 20:59:38 -08:00
Xiang Li
c5ca1218f3
etcdserver: GetClusterFromPeers -> GetClusterFromRemotePeers
2015-02-13 19:05:29 -08:00
Xiang Li
f7540912d6
etcdserver: getOtherPeerURLs -> getRemotePeerURLs
2015-02-13 18:56:45 -08:00
