Xiang Li
ba3a9b5f92
Merge pull request #3309 from xiang90/enforce
...
etcdserver: add version enforcement when setting cluster version
2015-08-17 12:41:04 -07:00
Xiang Li
15e03d801f
etcdserver: add version enforcement when setting cluster version
2015-08-17 11:12:39 -07:00
Xiang Li
f615f9a999
Merge pull request #3305 from xiang90/c_v
...
*: only print out major.minor version for cluster version
2015-08-17 09:40:01 -07:00
Xiang Li
d95c7d8a94
Merge pull request #3307 from ian-kelling/master
...
documentation: fix misspelled word
2015-08-15 18:53:58 -07:00
Ian Kelling
8dd44465c3
documentation: fix misspelled word
2015-08-15 17:56:17 -07:00
Xiang Li
f199a484af
*: only print out major.minor version for cluster version
2015-08-15 08:30:06 -07:00
Xiang Li
bbcb38189c
Merge pull request #3302 from xiang90/v
...
etcdserver: better version detection log output
2015-08-14 16:14:55 -07:00
Xiang Li
0076ab154b
etcdserver: better version detection log output
...
Fix https://github.com/coreos/etcd/issues/3288
2015-08-14 16:08:33 -07:00
Xiang Li
dd56b7e05e
Merge pull request #3299 from xiang90/txn
...
initial support for txn
2015-08-14 16:05:16 -07:00
Xiang Li
5cd109949a
etcdctl: support txn
2015-08-14 15:58:38 -07:00
Xiang Li
9233fff48f
etcdserver: support txn
2015-08-14 11:45:31 -07:00
Xiang Li
46865fa5a5
etcdserverpb: update proto
2015-08-14 11:45:07 -07:00
Yicheng Qin
d448593bbc
Merge pull request #3295 from yichengq/err-example
...
client: fix clusterError typo in README
2015-08-14 09:35:31 -07:00
Yicheng Qin
5eed141d54
client: fix clusterError typo in README
...
It helps users to use client better.
2015-08-13 16:38:41 -07:00
Yicheng Qin
fefb273389
*: bump to v2.2.0-alpha.1+git
2015-08-13 16:01:31 -07:00
Yicheng Qin
201bb4b3d8
*: bump to v2.2.0-alpha.1
2015-08-13 16:01:09 -07:00
Yicheng Qin
3cc4957d98
Merge pull request #3293 from yichengq/improve-err
...
etcdserver: improve error message when timeout due to leader fail
2015-08-13 15:58:48 -07:00
Yicheng Qin
c229e6e655
etcdserver: improve error message when timeout due to leader fail
2015-08-13 15:46:21 -07:00
Yicheng Qin
394894e03e
Merge pull request #3291 from yichengq/auth-cap
...
etcdhttp: add auth capability in 2.2
2015-08-13 15:01:59 -07:00
Yicheng Qin
ceb27b1c48
etcdhttp: add auth capability in 2.2
2015-08-13 14:49:10 -07:00
Yicheng Qin
a17288558e
Merge pull request #3289 from yichengq/marshal
...
etcdserver: go back to marshal request in 2.1 way
2015-08-13 14:20:24 -07:00
Yicheng Qin
334bdd1c26
Merge pull request #3153 from gtank/tls-setup
...
hack: TLS setup using cfssl
2015-08-13 13:53:14 -07:00
Xiang Li
959feb70d1
Merge pull request #3275 from xiang90/sort
...
improve in order key generation
2015-08-13 13:51:19 -07:00
Xiang Li
a7b9bff939
store: add 0 as padding for better lexicographic sorting.
2015-08-13 13:42:37 -07:00
Yicheng Qin
0fdb77aea2
etcdserver: go back to marshal request in 2.1 way
...
It fixes the problem that 2.1 cannot roll upgrade to 2.2 smoothly
because 2.1 cannot understand the bytes marshalled at 2.2.
2015-08-13 13:41:52 -07:00
Yicheng Qin
003d096138
Merge pull request #3286 from yichengq/fit-2.2
...
*: update MinClusterVersion and supportedStream map
2015-08-13 13:31:37 -07:00
Yicheng Qin
c9cca6a93b
*: update MinClusterVersion and supportedStream map
2015-08-13 13:05:14 -07:00
Xiang Li
846b1fdbcd
Merge pull request #3287 from xiang90/update_roadmap
...
Update roadmap
2015-08-13 13:00:01 -07:00
Xiang Li
329647ab62
roadmap: update roadmap
2015-08-13 12:56:23 -07:00
Xiang Li
6a64051245
roadmap: remove 2.1 milestone
2015-08-13 12:51:58 -07:00
Yicheng Qin
80005af5b2
Merge pull request #3285 from yichengq/bump-capnslog
...
godeps: bump capnslog to 42a8c3b1a6f917bb8346ef738f32712a7ca0ede7
2015-08-13 11:49:38 -07:00
Yicheng Qin
d66ede7186
godeps: bump capnslog to 42a8c3b1a6f917bb8346ef738f32712a7ca0ede7
2015-08-13 11:32:45 -07:00
Yicheng Qin
a46943548a
*: bump to v2.2.0-alpha.0+git
2015-08-13 10:21:36 -07:00
Yicheng Qin
ab5a69cb18
*: bump to v2.2.0-alpha.0
2015-08-13 10:20:05 -07:00
Yicheng Qin
976ce93539
Merge pull request #3277 from yichengq/better-log
...
etcdserver: specify timeout caused by leader election
2015-08-12 17:02:27 -07:00
Yicheng Qin
27170e67b9
etcdserver: specify timeout caused by leader election
...
Before this PR, the timeout caused by leader election returns:
```
14:45:37 etcd2 | 2015-08-12 14:45:37.786349 E | etcdhttp: got unexpected
response error (etcdserver: request timed out)
```
After this PR:
```
15:52:54 etcd1 | 2015-08-12 15:52:54.389523 E | etcdhttp: etcdserver:
request timed out, possibly due to leader down
```
2015-08-12 16:53:18 -07:00
Xiang Li
ddfe343e77
Merge pull request #3271 from yichengq/doc-discovery
...
docs: add discovery protocol doc
2015-08-12 13:51:32 -07:00
Yicheng Qin
a45f0ede56
docs: add discovery protocol doc
...
This document talks about the technical details of discovery service
protocol. It helps users to learn about how discovery service works and
what behavior to expect.
2015-08-12 13:15:21 -07:00
Alex Polvi
7bd9d9aede
Merge pull request #3273 from polvi/kube-hack
...
add etcd on k8s example
2015-08-12 22:13:15 +03:00
Alex Polvi
cfb3522b63
add etcd on k8s example
2015-08-12 22:12:00 +03:00
Xiang Li
f468d8b51a
Merge pull request #3270 from xiang90/better_err
...
Better error message for etcdctl
2015-08-12 10:27:42 -07:00
Xiang Li
7e04a79fb4
etcdctl: print out better error information
2015-08-12 10:09:56 -07:00
Xiang Li
5d06d4ec44
client: print url as string
2015-08-12 10:09:40 -07:00
Xiang Li
e894756144
Merge pull request #3190 from yichengq/adjust-prop-timeout
...
etcdserver: adjust proposal timeout based on config
2015-08-12 09:41:25 -07:00
Yicheng Qin
c3d4d11402
etcdhttp: adjust request timeout based on config
...
It uses heartbeat interval and election timeout to estimate the
expected request timeout.
This PR helps etcd survive under high roundtrip-time environment,
e.g., globally-deployed cluster.
2015-08-12 09:22:59 -07:00
Xiang Li
18ecc297bc
Merge pull request #3254 from es-chow/log-group
...
set groupID in multinode as log context so it can be logged
2015-08-12 08:05:50 -07:00
es-chow
cc362ccdad
raft: set logger to raft so log context such as multinode groupID can be logged
2015-08-12 22:56:00 +08:00
Yicheng Qin
5a91937367
etcdserver: adjust commit timeout based on config
...
It uses heartbeat interval and election timeout to estimate the
commit timeout for internal requests.
This PR helps etcd survive under high roundtrip-time environment,
e.g., globally-deployed cluster.
2015-08-11 21:09:03 -07:00
Yicheng Qin
042afcf2a3
Merge pull request #3266 from yichengq/client-readme
...
client: clean up README
2015-08-11 16:21:13 -07:00
Yicheng Qin
7d618c46ad
client: clean up README
...
Address rob's comments about sentences in README.
2015-08-11 15:33:56 -07:00
