Yicheng Qin
cb59a46576
Merge pull request #1396 from unihorn/185
...
etcdhttp: trim StoreKeysPrefix from error in serveKeys
2014-10-24 14:48:31 -07:00
Jonathan Boulle
46528ee17b
Merge pull request #1391 from jonboulle/version
...
/version is 404 now
2014-10-24 14:48:02 -07:00
Jonathan Boulle
9a465b9cf5
etcdhttp: add /version endpoint
2014-10-24 14:47:37 -07:00
Jonathan Boulle
dc46d40b8e
Merge pull request #1397 from jonboulle/log_raft_msg
...
etcdserver/etcdhttp: remove log message for every received raft
2014-10-24 14:29:38 -07:00
Jonathan Boulle
bac13b5cb2
etcdserver/etcdhttp: remove log message for every received raft
2014-10-24 14:25:20 -07:00
Yicheng Qin
34dcbb4679
etcdhttp: trim StoreKeysPrefix from error in serveKeys
...
It returns error messaage like this now:
'{"errorCode":100,"message":"Key not found","cause":"/1/pants","index":10}'
The commit trims '/1' prefix from cause field if exists.
This is a hack to make it display well. It is correct because all error causes
that contain Path puts Path at the head of the string.
2014-10-24 14:12:53 -07:00
Xiang Li
030aed8205
Merge pull request #1394 from xiangli-cmu/initial-advertise-peer-urls
...
*: change advertise-peer-urls -> initial-advertise-peer-urls
2014-10-24 14:08:25 -07:00
Xiang Li
2e84eb3c36
*: change advertise-peer-urls -> initial-advertise-peer-urls
2014-10-24 13:51:59 -07:00
Brian Waldon
9a38be297c
Merge pull request #1380 from bcwaldon/client-keys-API
...
Break apart KeysAPI
2014-10-24 13:48:12 -07:00
Brian Waldon
f21d93ba60
client: define DefaultRequestTimeout
2014-10-24 13:28:04 -07:00
Brian Waldon
45d8fbdcda
client: move discovery path logic into client pkg
2014-10-24 13:28:04 -07:00
Brian Waldon
ce4df96e69
client: break apart KeysAPI from httpClient
2014-10-24 13:27:59 -07:00
Jonathan Boulle
d7f9228133
Merge pull request #1381 from jonboulle/members
...
/v2/admin/members API should use JSON containers in response
2014-10-24 13:20:10 -07:00
Yicheng Qin
49a68adcf1
Merge pull request #1386 from unihorn/184
...
etcdserver: update member attribute when apply request
2014-10-24 12:46:11 -07:00
Yicheng Qin
ea0bff80c0
etcdserver: update member attribute when apply request
2014-10-24 12:43:53 -07:00
Yicheng Qin
d1b57b448d
Merge pull request #1383 from unihorn/183
...
etcdserver: support newly-join member bootstrap
2014-10-24 12:43:25 -07:00
Yicheng Qin
08593bcdf6
etcdserver: support newly-join member bootstrap
2014-10-24 12:38:44 -07:00
Xiang Li
9fb02eb6fa
Merge pull request #1387 from xiangli-cmu/fix_raft
...
Fix raft
2014-10-24 12:10:54 -07:00
Jonathan Boulle
543e12074a
etcdserver/member: change JSON fields to lowerCamelCase
2014-10-24 12:03:17 -07:00
Jonathan Boulle
14852662ef
etcdhttp: rename Members -> members in JSON, update doc
2014-10-24 12:03:17 -07:00
Jonathan Boulle
7ef468b315
etcdhttp: remove /v2/admin/members/x serving
2014-10-24 12:03:17 -07:00
Jonathan Boulle
9b679de9dd
etcdserver/etcdhttp: use container for admin/members endpoint
2014-10-24 12:03:17 -07:00
Brian Waldon
c8634428fa
Merge pull request #1364 from bcwaldon/import-etcdctl
...
Import etcdctl
2014-10-24 12:02:41 -07:00
Xiang Li
507300130b
raft: add tests for ignoring heartbeat reply
2014-10-24 11:50:21 -07:00
Xiang Li
e081ad7298
Merge pull request #1368 from xiangli-cmu/doc
...
doc: add admin api doc
2014-10-24 10:42:14 -07:00
Jonathan Boulle
85800fd8f6
Merge pull request #1385 from jonboulle/config
...
etcdserver: fix + expand config tests
2014-10-24 10:10:07 -07:00
Jonathan Boulle
0276089ed9
etcdserver: fix + expand config tests
2014-10-24 10:09:42 -07:00
Jonathan Boulle
3a41161e76
Merge pull request #1384 from jonboulle/test
...
etcdserver: add test for cluster.String
2014-10-24 10:03:37 -07:00
Jonathan Boulle
b9514ea265
etcdserver: add test for cluster.String
2014-10-24 10:03:28 -07:00
Xiang Li
4c9d67aaa2
Merge pull request #1379 from xiangli-cmu/fix_member
...
etcdserver: fix member endpoint on peerurl
2014-10-23 17:25:40 -07:00
Xiang Li
ed29259801
etcdserver: fix member endpoint on peerurl
2014-10-23 17:18:01 -07:00
Brian Waldon
500d21591f
Merge pull request #1377 from bcwaldon/client-cleanup
...
Make httpClient.SetPrefix safer
2014-10-23 16:35:45 -07:00
Brian Waldon
992e7c76e0
client: copy v2KeysPrefix to httpClient
...
It's poor form to muck with a global variable. Make a copy when the
httpClient object is instantiated to make httpClient.SetPrefix safe.
2014-10-23 16:31:45 -07:00
Brian Waldon
a85a47c8f9
client: s/v2URL/v2KeysURL/
2014-10-23 16:31:42 -07:00
Brian Waldon
ebe32689d4
client: s/v2Prefix/DefaultV2KeysPrefix/
2014-10-23 16:30:56 -07:00
Jonathan Boulle
d1d12abfd7
Merge pull request #1372 from jonboulle/proxy
...
main: fix proxy initialization and setupCluster
2014-10-23 16:12:19 -07:00
Jonathan Boulle
d7301a5cf4
main: fix proxy initialization and setupCluster
2014-10-23 16:09:29 -07:00
Xiang Li
d8258c38be
Merge pull request #1374 from xiangli-cmu/cluster_on_peerurl
...
etcdserver: add member endpoint to peerurl
2014-10-23 16:08:45 -07:00
Jonathan Boulle
0eddf3db1f
Merge pull request #1375 from jonboulle/sort
...
etcdserver: sort Members() in Cluster
2014-10-23 16:01:29 -07:00
Jonathan Boulle
af42f4a56b
etcdserver: sort Members() in Cluster
2014-10-23 15:57:27 -07:00
Xiang Li
02551c277d
etcdserver: add member endpoint to peerurl
2014-10-23 15:55:00 -07:00
Jonathan Boulle
17bd5c3d21
Merge pull request #1373 from jonboulle/header
...
main: add header
2014-10-23 15:37:35 -07:00
Jonathan Boulle
0d36385bb4
main: add header
2014-10-23 14:46:05 -07:00
Yicheng Qin
4089475c90
Merge pull request #1361 from unihorn/182
...
etcdserver: refactor cluster and clusterStore
2014-10-23 14:40:37 -07:00
Yicheng Qin
4d80f01201
etcdserver: Cluster.IsIDremoved -> Cluster.IsIDRemoved
2014-10-23 14:29:58 -07:00
Xiang Li
c25c50582e
doc: add admin api doc
2014-10-23 14:26:33 -07:00
Yicheng Qin
d47de988e4
etcdserver: panic when >1 members have the given name in MemberByName
2014-10-23 14:24:07 -07:00
Yicheng Qin
5fbe6c7134
main: add genClusterString func and its test
2014-10-23 14:19:40 -07:00
Yicheng Qin
8eee8c260e
etcdserver: rebase on master and code clean
2014-10-23 13:58:55 -07:00
Yicheng Qin
e21de51768
etcdserver: remove NewClusterFromMemberInfos
2014-10-23 13:27:55 -07:00
