Xiang Li
7c8b9c0203
Merge pull request #2011 from xiang90/timeutil
...
etcdserver: move getExpr to timeutil
2014-12-29 12:03:25 -08:00
Yicheng Qin
dc6ba914c8
Merge pull request #2010 from yichengq/264
...
rafthttp: cleanup transport
2014-12-29 11:22:59 -08:00
Yicheng Qin
5bb8eeb5cf
rafthttp: transport cleanup
2014-12-29 11:21:40 -08:00
Xiang Li
cea29fe158
etcdserver: move getExpr to timeutil
2014-12-29 11:15:02 -08:00
Xiang Li
5f11d5a0d0
Merge pull request #1999 from xiang90/discovery_srv
...
*: move srv into pkg discovery
2014-12-29 10:27:45 -08:00
Yicheng Qin
e1ee335c3a
Merge pull request #1802 from yichengq/235
...
rafthttp: set the API boundary of the package
2014-12-28 16:00:24 -08:00
Yicheng Qin
08f839e32c
rafthttp: set the API boundary of the package
2014-12-28 15:50:27 -08:00
Xiang Li
0630f42e7a
Merge pull request #2009 from xiang90/refactor
...
etcdserver: remove unused containsUint64()
2014-12-26 11:09:23 -08:00
Xiang Li
1535596252
etcdserver: remove unnecessary indirection
2014-12-26 11:03:13 -08:00
Xiang Li
3dcd66459d
etcdserver: remove unused containsUint64()
2014-12-26 10:56:56 -08:00
Xiang Li
e056e96ad5
Merge pull request #2008 from xiang90/server_clean
...
etcdserver: cleanup server.go
2014-12-25 21:40:35 -08:00
Xiang Li
69444b6bba
etcdserver: cleanup server.go
2014-12-25 21:37:20 -08:00
Xiang Li
60d25635c4
Merge pull request #2007 from xiang90/cluster_clean
...
etcdserver: cleanup cluster.go
2014-12-25 21:03:40 -08:00
Xiang Li
78b51d3f2f
etcdserver: cleanup cluster.go
2014-12-25 20:56:30 -08:00
Xiang Li
9c84443f42
Merge pull request #2006 from xiang90/cluster_clean
...
cluster clean up
2014-12-25 20:45:01 -08:00
Xiang Li
6dc3af5da4
etcdserver: cluster clean up
2014-12-25 20:36:48 -08:00
Xiang Li
7a5bf53222
etcdserver: move member sort interface to member.go
2014-12-25 20:18:55 -08:00
Xiang Li
7ce0fc782e
Merge pull request #2005 from xiang90/kill_todo
...
etcdserver: kill a todo in test
2014-12-25 18:14:27 -08:00
Xiang Li
ef0a66bb0a
etcdserver: kill a todo in test
2014-12-25 18:14:05 -08:00
Xiang Li
52fc768c28
Merge pull request #2001 from xiang90/cleanup
...
etcdserver: cleanup
2014-12-25 17:57:08 -08:00
Xiang Li
00b4e919d0
Merge pull request #2003 from xiang90/raft_clean
...
raft: remove unnecessary funcs in raft.go
2014-12-25 17:06:02 -08:00
Xiang Li
fc96a9e4a7
raft: remove unnecessary funcs in raft.go
2014-12-25 17:04:33 -08:00
Xiang Li
f43bc809b9
etcdserver: cleanup wal upgrade
2014-12-24 22:02:46 -08:00
Xiang Li
7d866dbc44
Merge pull request #2000 from xiang90/rm
...
etcdserver: remove example.go
2014-12-24 21:41:43 -08:00
Xiang Li
b9d228b0fa
etcdserver: remove example.go
2014-12-24 21:41:31 -08:00
Xiang Li
08e9c25ea5
*: move srv into pkg discovery
2014-12-24 21:37:20 -08:00
Kelsey Hightower
7ec2e382bd
Merge pull request #1996 from kelseyhightower/fix-dns-discovery-hostnames
...
etcdmain: resolve DNS hostnames for client and peer URLs
2014-12-24 13:24:07 -05:00
Kelsey Hightower
705ec45083
etcdmain: resolve DNS hostnames for client and peer URLs
...
etcd resolves DNS hostnames to IP addresses for client and peer URLs
before creating any listening sockets.
The following messages are logged during startup:
etcd: Resolving infra0.coreos.com:2380 to 10.0.1.10:2380
Fixes #1991
2014-12-24 13:12:32 -05:00
Jonathan Boulle
289b070aa5
Merge pull request #1985 from mgwilliams/config-docs
...
fix an error in the 2.0 config docs
2014-12-22 18:48:41 -08:00
Matthew Williams
08f74cf68f
fix an error in the 2.0 config docs
2014-12-23 02:41:12 +00:00
Xiang Li
2b9f388a91
Merge pull request #1983 from xiang90/raft_storage_doc
...
raft: add doc for storage
2014-12-22 12:34:36 -08:00
Xiang Li
2dbdf87f86
raft: add doc for storage
2014-12-22 12:33:14 -08:00
Xiang Li
d87ee9819b
Merge pull request #1982 from xiang90/srv_doc
...
doc: doc addition/fix for discovery-srv flag
2014-12-22 12:22:14 -08:00
Xiang Li
ee7f23d0d5
doc: doc addition/fix for discovery-srv flag
2014-12-22 12:10:04 -08:00
Xiang Li
841368c8e3
Merge pull request #1981 from xiang90/flag_test
...
etcdmian: add tests for configuration parsing
2014-12-22 12:00:25 -08:00
Xiang Li
3abe71dff5
etcdmian: add tests for configuration parsing
2014-12-22 11:56:56 -08:00
Xiang Li
f143948fdd
Merge pull request #1976 from xiang90/flag
...
etcdmain: add config.go
2014-12-19 18:39:19 -08:00
Xiang Li
0fa754d90e
etcdmain: add config.go
2014-12-19 18:33:19 -08:00
Kelsey Hightower
39786c4bea
Merge pull request #1977 from kelseyhightower/update-clustering-docs
...
docs: document DNS bootstrapping
2014-12-19 17:53:40 -08:00
Kelsey Hightower
fb4781920c
docs: document DNS bootstrapping
2014-12-19 17:51:03 -08:00
Xiang Li
1a5afaec7a
Merge pull request #1973 from kelseyhightower/dns-bootstrap-docs
...
docs: add dns bootstrap guide
2014-12-19 15:07:57 -08:00
Barak Michener
4f2d35679e
Merge pull request #1947 from barakmich/dns_bootstrap
...
add capability to bootstrap from DNS SRV
2014-12-19 13:45:03 -08:00
Barak Michener
8fc17147ef
change logging
2014-12-19 16:40:29 -05:00
Kelsey Hightower
1f98d15535
docs: add dns bootstrap guide
2014-12-19 13:24:28 -08:00
Xiang Li
f78bf987c8
Merge pull request #1968 from xiang90/fix_raft_test
...
raft: flush the commit to fix a race in test
2014-12-18 17:11:13 -08:00
Xiang Li
896bac1f76
raft: flush the commit to fix a race in test
2014-12-18 17:10:37 -08:00
Jonathan Boulle
f8752f9879
Merge pull request #1966 from jonboulle/5to2
...
*: change remaining 0.5 references -> 2.0
2014-12-18 16:51:15 -08:00
Jonathan Boulle
021fc140b8
Merge pull request #1965 from jonboulle/fileutil
...
pkg/fileutil: sort filenames during ReadDir
2014-12-18 16:44:07 -08:00
Jonathan Boulle
1ec98cb795
pkg/fileutil: sort filenames during ReadDir
2014-12-18 16:36:11 -08:00
Jonathan Boulle
2311463935
Merge pull request #1967 from jonboulle/master
...
README: update version disclaimer
2014-12-18 16:27:32 -08:00