From 480e21f97352d3a86d3526c87a987a36c3aa19af Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 19 Nov 2014 11:33:50 -0800 Subject: [PATCH 1/3] Fix etcd unpack by adding a explicit x flag. --- cluster/saltbase/salt/etcd/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/etcd/init.sls b/cluster/saltbase/salt/etcd/init.sls index 6fdea7df6a2..cd09961a842 100644 --- a/cluster/saltbase/salt/etcd/init.sls +++ b/cluster/saltbase/salt/etcd/init.sls @@ -24,7 +24,7 @@ etcd-tar: - source_hash: {{ etcd_tar_hash }} - archive_format: tar - if_missing: /usr/local/src/etcd-{{ etcd_version }}-linux-amd64 - - tar_options: z + - tar_options: xz file.directory: - name: /usr/local/src/etcd-{{ etcd_version }}-linux-amd64 - user: root From efd443bcd6f005566daa85da0a5f0b633b40d4e3 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 19 Nov 2014 12:36:30 -0800 Subject: [PATCH 2/3] Add the 0.4.4 release --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 34e142f3d44..af0e103939d 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -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 = "4.3+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.4.3-dev" // version from git, output of $(git describe) + gitMinor string = "4.4" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.4.4" // 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" ) From 2bfe0215f5364aeab29ac9e71df3b582714363e3 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 19 Nov 2014 12:37:07 -0800 Subject: [PATCH 3/3] add 0.4.4-dev --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index af0e103939d..3ecc40bc504 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -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 = "4.4" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.4.4" // version from git, output of $(git describe) + gitMinor string = "4.4+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.4.4-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" )