Merge pull request #30309 from timothysc/etcd304

Automatic merge from submit-queue Update etcd makefile to build 3.0.4 Bumps the dependency, but we will also need someone to push to the google repos too. /cc @kubernetes/sig-scalability xref: #29235 #29399  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30309)

Merge pull request #30309 from timothysc/etcd304
bb8d2b21 · Kubernetes Submit Queue · GitHub · 0da589fa · d22e7a1b · bb8d2b21
Commit bb8d2b21 authored Aug 10, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

No files found.
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -17,7 +17,7 @@
 # Usage:
 # 	[TAG=2.2.1] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)

-TAG?=3.0.3
+TAG?=3.0.4
 ARCH?=amd64
 REGISTRY?=gcr.io/google_containers
 GOLANG_VERSION?=1.6.3
@@ -78,4 +78,4 @@ ifeq ($(ARCH),amd64)
 endif

 all: build
-.PHONY:	build push
\ No newline at end of file
+.PHONY:	build push