Merge branch 'master' of https://github.com/zalando/spilo

zalando · Apr 28, 2015 · 5ee5a95 · 5ee5a95
2 parents 9409f48 + 095831a
commit 5ee5a95
Show file tree

Hide file tree

Showing 6 changed files with 785 additions and 143 deletions.
diff --git a/etcd-cluster-appliance/Dockerfile b/etcd-cluster-appliance/Dockerfile
@@ -4,7 +4,7 @@ FROM zalando/ubuntu:14.04.1-1
 RUN apt-get update && apt-get -y install python python-boto
 
 ## Install etcd
-ENV ETCDVERSION 2.0.9
+ENV ETCDVERSION 2.0.10
 RUN mkdir -m 777 /etcd && curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-amd64.tar.gz | tar xz -C /etcd --strip=1 --wildcards --no-anchored etcd etcdctl
 EXPOSE 2379 2380