Merge pull request #10140 from brendandburns/rev-etcd

rev etcd to 2.0.12
This commit is contained in:
Zach Loafman 2015-06-22 10:32:19 -07:00
commit 1559fa8b7e
2 changed files with 3 additions and 3 deletions

View File

@ -1,8 +1,8 @@
.PHONY: clean build push .PHONY: clean build push
IMAGE = etcd IMAGE = etcd
TAG = 2.0.9.1 TAG = 2.0.12
ETCD_VERSION = 2.0.9 ETCD_VERSION = 2.0.12
OUTPUT_DIR = $(IMAGE)-v$(ETCD_VERSION)-linux-amd64 OUTPUT_DIR = $(IMAGE)-v$(ETCD_VERSION)-linux-amd64
clean: clean:

View File

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