Merge pull request #10187 from zmerlynn/release-0.19

Release 0.19.3
This commit is contained in:
Robert Bailey
2015-06-22 11:05:33 -07:00
3 changed files with 6 additions and 6 deletions

View File

@@ -1,8 +1,8 @@
.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:
@@ -16,6 +16,6 @@ build: clean
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
push: build
gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)
all: push

View File

@@ -7,7 +7,7 @@
"containers":[
{
"name": "etcd-container",
"image": "gcr.io/google_containers/etcd:2.0.9",
"image": "gcr.io/google_containers/etcd:2.0.12",
"command": [
"/usr/local/bin/etcd",
"--addr",

View File

@@ -36,8 +36,8 @@ package version
var (
// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
gitMajor string = "0" // major version, always numeric
gitMinor string = "19.1+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.19.1-dev" // version from git, output of $(git describe)
gitMinor string = "19.3+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.19.3-dev" // version from git, output of $(git describe)
gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD)
gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
)