d4e19d1afb
Merge pull request #3501 from yichengq/update-peers
...
docs/admin_guide: use ETCDCTL_ENDPOINT
2015-09-12 08:31:47 -07:00
e9512f8c5f
docs/admin_guide: use ETCDCTL_ENDPOINT
...
because ETCDCTL_PEERS is not prefered.
2015-09-11 19:38:55 -07:00
28a371471a
Merge pull request #3500 from yichengq/fix-ETCD
...
libraries-and-tools.md: correct project name to etcd
2015-09-11 19:34:15 -07:00
4e71954111
libraries-and-tools.md: correct project name to etcd
...
etcd is the official name of the project.
2015-09-11 19:31:40 -07:00
a528cb6f5d
Merge pull request #3495 from rekby/patch-2
...
libraries-and-tools.md: add etcddir
2015-09-11 19:30:03 -07:00
f8f702b3f8
Merge pull request #3497 from jonboulle/master
...
docs: add official client to libraries-and-tools
2015-09-11 15:17:30 -07:00
fd82f0b8d5
docs: add official client to libraries-and-tools
2015-09-11 15:16:02 -07:00
136efd3ba9
libraries-and-tools.md: add etcddir
2015-09-11 21:04:56 +03:00
c5c3ae4790
Merge pull request #3486 from yichengq/readme
...
README: warn that master branch is unstable
2015-09-10 19:20:35 -07:00
56d61d995a
Merge pull request #3487 from onlyjob/master
...
Minor spelling corrections (codespell).
2015-09-10 17:46:29 -07:00
b2f4a5f587
*: fix spelling issues (codespell).
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-09-11 10:22:29 +10:00
bd5f924b0f
README: warn that master branch is unstable
...
Avoid users building from master branch for stable binaries.
2015-09-10 14:27:10 -07:00
1de63deca4
Merge pull request #3483 from xiang90/update_roadmap
...
roadmap.md: update roadmap for 2.3
2015-09-10 13:32:30 -07:00
f51c2f471b
Merge pull request #3482 from yichengq/client
...
client: add Nodes type to faciliate sorting
2015-09-10 12:29:12 -07:00
07bd9f65d3
roadmap.md: update roadmap for 2.3
2015-09-10 12:24:48 -07:00
2f558e56d2
client: add Nodes to codecgen and regenerate
2015-09-10 11:51:59 -07:00
eb51901830
client: add Nodes type to faciliate sorting
...
This helps users to sort easily.
2015-09-10 11:03:12 -07:00
db0511e28c
*: bump to v2.2.0+git
2015-09-10 10:03:07 -07:00
e4561dd8cf
*: bump to v2.2.0
2015-09-10 10:02:45 -07:00
6e7725cd51
Merge pull request #3478 from endocode/kayrus/typo_fix
...
doc: member id typo fixed
2015-09-10 00:11:26 -07:00
37392ad223
doc: member id typo fixed
2015-09-10 08:47:45 +02:00
9b032c6a00
Merge pull request #3473 from MrLawes/master
...
doc: fix bad url in using a directory TTL section
2015-09-09 18:57:09 -07:00
1c058e9706
doc: fix bad url in using a directory TTL section
2015-09-10 09:23:10 +08:00
f3085d2ea4
Merge pull request #3459 from yichengq/release-doc
...
docs/dev: add release doc
2015-09-09 17:46:10 -07:00
b70e6fc677
docs/dev: add release doc
...
It documents the standard way to release etcd today. Maintainer should
follow this doc to cut release, and update it in time to fit current
situation.
2015-09-09 16:42:31 -07:00
c34cf04c27
Merge pull request #3448 from yichengq/release-script
...
scripts: add release.sh
2015-09-09 13:54:15 -07:00
bdd8774169
Merge pull request #3204 from endocode/kayrus/recovery
...
Improved "disaster restore" doc, added "member update" command descri…
2015-09-09 12:23:51 -07:00
19ad634673
doc: improved "disaster restore" doc, added "member update" command description
2015-09-09 20:07:31 +02:00
7d4cd7c76a
scripts: add release.sh
...
It could build all binaries and images for the given version.
2015-09-09 09:50:41 -07:00
af0474f2e3
Merge pull request #3465 from raoofm/patch-1
...
etcdmain: Proxy doesnt specify - listening on http or https
2015-09-08 14:38:55 -07:00
2de1c36061
etcdmain: Proxy doesnt specify - listening on http or https
...
etcdmain: Proxy doesnt specify - listening on http or https
Fixes #3464
2015-09-08 17:19:23 -04:00
ccdd10c757
Merge pull request #3463 from yichengq/update-roadmap
...
roadmap: remove 2.2 section
2015-09-08 13:55:50 -07:00
c837f0526f
roadmap: remove 2.2 section
...
We have finished all of them.
2015-09-08 13:43:39 -07:00
d8e6e217fd
Merge pull request #3461 from xiang90/doc
...
doc: remove one limitation in upgrade doc
2015-09-08 13:29:43 -07:00
3689ea3071
doc: remove one limitation in upgrade doc
2015-09-08 13:28:23 -07:00
a44da0b62a
Merge pull request #3451 from raoofm/patch-1
...
discovery: log error only if both ssl and non-ssl srv lookups fail
2015-09-06 20:54:43 -07:00
9a2809f0b5
discovery: log error only if both ssl and non-ssl srv lookups fail
...
discovery: log error only if both ssl and non-ssl srv lookups fail
Earlier we were logging as soon as one of the lookups failed.
Fixes #3414
2015-09-06 23:44:19 -04:00
184337568d
scripts/build-docker: build docker in image-docker dir
...
The docker build command will use whatever directory contains the
Dockerfile as the build context (including all of its subdirectories).
And the <src> path of ADD must be inside the context of the build.
So change it to build in a specific directory for clean and fast.
2015-09-06 00:17:41 -07:00
15d1db9bf8
scripts/build-aci: support BINARYDIR and BUILDDIR
...
This makes it more configurable, and is ready for overall release script.
2015-09-06 00:17:41 -07:00
6b70fa72fe
scripts: build-release -> build-binary
...
This makes the functionality of the script more clear, and always use
bash to run the script because it has bash-specific grammar.
2015-09-06 00:16:51 -07:00
cf6cb82caa
scripts/build-docker: stop creating scratch image
...
Scratch image has become docker's reserved image.
2015-09-06 00:16:08 -07:00
a1b01c266a
scripts/build-aci: fix the way to check executability
...
Or it may treat runnable command as unexecutable.
2015-09-06 00:15:31 -07:00
b9646b5734
Merge pull request #3447 from xiang90/txn
...
etcdctlv3: fix txn command
2015-09-05 18:21:11 -07:00
1532f7585b
etcdctlv3: fix txn command
2015-09-05 16:08:15 -07:00
dab0871acb
Merge pull request #3446 from xiang90/v3
...
etcdserver: refactor v3demo do
2015-09-05 15:41:00 -07:00
95d5556445
etcdserver: refactor v3demo do
2015-09-05 15:31:28 -07:00
d5ab71a4e8
Merge pull request #3445 from xiang90/api_doc
...
doc: add monitoring section to admin doc
2015-09-05 08:27:11 -07:00
13b3c64c10
doc: add monitoring section to admin doc
2015-09-05 08:25:35 -07:00
51d0630a8e
Merge pull request #3440 from yichengq/memory-bench
...
docs/benchmark: add 2.2.0-rc memory usage benchmark
2015-09-04 20:23:56 -07:00
91b5b247e9
docs/benchmark: add 2.2.0-rc memory usage benchmark
...
It records the memory usage for different average value size, and
records the data size limitation.
2015-09-04 18:27:49 -07:00
Yicheng Qin