Merge pull request #6544 from dchen1107/image

Build etcd image (version 2.0.9), and upgrade kubernetes cluster to the new version

Merge pull request #6544 from dchen1107/image
87e497c7 · Vish Kannan · 1d158881 · 8ede54c5 · 87e497c7 · 87e497c7
Commit 87e497c7 authored Apr 07, 2015 by Vish Kannan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile cluster/images/etcd/Makefile +1 -1

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.8
+TAG = 2.0.9
 OUTPUT_DIR = $(IMAGE)-v$(TAG)-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.8",
+    "image": "gcr.io/google_containers/etcd:2.0.9",
    "command": [
              "/usr/local/bin/etcd",
 	      "--addr",