summaryrefslogtreecommitdiff
path: root/development.md
diff options
context:
space:
mode:
authorMarek Grabowski <gmarek@google.com>2015-10-15 09:29:25 +0200
committerMarek Grabowski <gmarek@google.com>2015-10-15 09:29:25 +0200
commit3456f3745e49ab8bf85f2ff7db4a8105e64fb621 (patch)
treebfeb554231442078191259a90700850d7a7fd783 /development.md
parent576acdb7fb386e5f34104da4042dbe9f728a79b5 (diff)
parentaee2383f9b350d0ea7b5d14b60b5c77fdef08391 (diff)
Merge pull request #15336 from ixdy/install-etcd
Move hack/travis/install-etcd.sh to hack/, and update etcd version to 2.0.12
Diffstat (limited to 'development.md')
-rw-r--r--development.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/development.md b/development.md
index 87fb02d5..0b778dd9 100644
--- a/development.md
+++ b/development.md
@@ -264,7 +264,9 @@ Coverage results for the project can also be viewed on [Coveralls](https://cover
## Integration tests
-You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.0) in your path, please make sure it is installed and in your ``$PATH``.
+You need an [etcd](https://github.com/coreos/etcd/releases) in your path. To download a copy of the latest version used by Kubernetes, either
+ * run `hack/install-etcd.sh`, which will download etcd to `third_party/etcd`, and then set your `PATH` to include `third_party/etcd`.
+ * inspect `cluster/saltbase/salt/etcd/etcd.manifest` for the correct version, and then manually download and install it to some place in your `PATH`.
```sh
cd kubernetes