Merge pull request #10140 from brendandburns/rev-etcd

rev etcd to 2.0.12

Merge pull request #10140 from brendandburns/rev-etcd
1559fa8b · Zach Loafman · 1f4ece84 · ec1e308a · 1559fa8b · 1559fa8b
Commit 1559fa8b authored Jun 22, 2015 by Zach Loafman
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Makefile cluster/images/etcd/Makefile +2 -2

etcd.manifest cluster/saltbase/salt/etcd/etcd.manifest +1 -1

No files found.
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
 .PHONY:	clean build push

 IMAGE = etcd
-TAG = 2.0.9.1
-ETCD_VERSION = 2.0.9
+TAG = 2.0.12
+ETCD_VERSION = 2.0.12
 OUTPUT_DIR = $(IMAGE)-v$(ETCD_VERSION)-linux-amd64

 clean:

--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -7,7 +7,7 @@
 "containers":[
    {
    "name": "etcd-container",
-    "image": "gcr.io/google_containers/etcd:2.0.9.1",
+    "image": "gcr.io/google_containers/etcd:2.0.12",
    "command": [
              "/bin/sh",
              "-c",