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
Xiang Li
0fcbadc10b
Merge pull request #2305 from xiang90/fix_win
...
osutil: fix win build
2015-02-13 16:39:07 -08:00
Xiang Li
e44dc0f3fe
osutil: fix win build
2015-02-13 16:33:39 -08:00
Yicheng Qin
4d728cc8c4
*: bump to v2.0.3
2015-02-13 15:27:24 -08:00
Xiang Li
f7998bb2db
Merge pull request #2304 from xiang90/fix_discovery_validation
...
etcdserver: validate discovery cluster
2015-02-13 14:41:09 -08:00
Xiang Li
cfa7ab6074
etcdserver: validate discovery cluster
2015-02-13 14:32:24 -08:00
Barak Michener
b59390c9c3
Merge pull request #2293 from barakmich/etcd_underscore
...
migrate: stop deleting _etcd
2015-02-13 17:10:14 -05:00
Barak Michener
fdebf2b109
fix parent references
2015-02-13 16:54:15 -05:00
Barak Michener
e9f4be498d
migrate: decrease memory usage (only duplicate machines)
2015-02-13 15:26:54 -05:00
Xiang Li
6d9d7b4497
Merge pull request #2302 from xiang90/fix_travis
...
integration: wait for slow travis
2015-02-13 11:49:37 -08:00
Xiang Li
163ea3f5c5
integration: wait for slow travis
2015-02-13 11:41:03 -08:00
Yicheng Qin
ea1e54b2a1
Merge pull request #2291 from ArtfulCoder/master
...
Added go build flag '-installsuffix cgo' to create a static library for etcd and etcdctl
2015-02-13 11:23:03 -08:00
Xiang Li
b31109cfd7
Merge pull request #2290 from xiang90/fix_transport
...
etcdserver: recover transport when recovering from a snapshot
2015-02-13 10:23:29 -08:00
Yicheng Qin
7a909c3950
Merge pull request #2282 from matishsiao/patch-1
...
add etcd-console tool to tools list
2015-02-13 10:20:31 -08:00
Xiang Li
c16cc3a6a3
etcdserver: recover transport when recovering from a snapshot
2015-02-13 10:16:28 -08:00
Xiang Li
d7840b75c3
Merge pull request #2301 from xiang90/fix_snap
...
integration: fix test
2015-02-13 10:03:45 -08:00
Xiang Li
aed2c82e44
integration: fix test
2015-02-13 10:02:42 -08:00
Xiang Li
39ee85470f
Merge pull request #2300 from xiang90/fix_snap
...
etcdserver: fix snapshot
2015-02-13 09:56:19 -08:00
Xiang Li
fbc4c8efb5
etcdserver: fix snapshot
2015-02-13 09:54:25 -08:00
Xiang Li
12999ba083
Merge pull request #2298 from barakmich/issue2295
...
etcdserver: Unmask the snapshotter. Fixes #2295
2015-02-13 09:38:58 -08:00
Barak Michener
a0e3bc9cbd
etcdserver: Unmask the snapshotter. Fixes #2295
2015-02-13 11:56:00 -05:00
Xiang Li
b06e43b803
Merge pull request #2289 from fabxc/feature/graceful_shutdown
...
main: shutdown gracefully.
2015-02-13 07:34:07 -08:00
Fabian Reinartz
8bf795dc3c
etcdmain/osutil: shutdown gracefully, interrupt handling
...
The functionality in pkg/osutil ensures that all interrupt handlers finish
and the process kills itself with the proper signal.
Test for interrupt handling added.
The server shutsdown gracefully by stopping on interrupt (Issue #2277.)
2015-02-13 10:28:53 +01:00
Barak Michener
02c52f175f
migrate: stop deleting etcd
2015-02-12 19:35:33 -05:00
Xiang Li
daf1a913bb
Merge pull request #2287 from Amit-PivotalLabs/master
...
rafthttp/transport.go: Fix nil pointer dereference in RemovePeer
2015-02-12 14:49:12 -08:00
Amit Gupta
317e57a8a8
rafthttp: Panic informatively when removing unknown peer ID
2015-02-12 14:43:44 -08:00
Abhi Shah
5c0d3889f8
Added go build flag '-installsuffix cgo' to create a static library. This is needed when go 1.4 is used to build.
2015-02-12 14:08:02 -08:00
Yicheng Qin
a71184424a
*: bump to v2.0.2+git
2015-02-12 11:41:48 -08:00
Yicheng Qin
409daceb73
*: bump to v2.0.2
2015-02-12 11:14:50 -08:00
Barak Michener
c6cc276ef0
Merge pull request #2286 from barakmich/fix_migrations
...
etcdserver: Canonicalize migrations
2015-02-12 12:53:33 -05:00
Barak Michener
cd50f0e058
etcdserver: Create MemberDir() and base {Snap,WAL}Dir() thereon. Audit DataDir.
2015-02-12 12:45:19 -05:00
Barak Michener
fade9b6065
etcdserver: Refactor 2.0.1 directory rename into a proper migration
...
fix all instances
fix detection test
2015-02-12 11:53:19 -05:00
