From d357a22f8d460c9a30cd4ab7bf66d2cb23b23d03 Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Thu, 25 Dec 2014 18:22:59 +0000 Subject: [PATCH 1/3] update cadvisor static manifest file completely. (cherry picked from commit 2d5432bc91d72181c341676552331012fa3252c3) --- cluster/saltbase/salt/cadvisor/cadvisor.manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/saltbase/salt/cadvisor/cadvisor.manifest b/cluster/saltbase/salt/cadvisor/cadvisor.manifest index 1091eac7f20..d200fe20a79 100644 --- a/cluster/saltbase/salt/cadvisor/cadvisor.manifest +++ b/cluster/saltbase/salt/cadvisor/cadvisor.manifest @@ -26,7 +26,7 @@ volumes: source: hostDir: path: /var/lib/docker - - name: cgroups + - name: sysfs source: hostDir: - path: /sys/fs/cgroup + path: /sys From 0d6131bbcd6682d0e51eefc0e439e5dcbbf511b1 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Mon, 29 Dec 2014 11:05:11 -0800 Subject: [PATCH 2/3] Kubernetes version v0.7.2 --- 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 f26c9deb767..e61517e18c3 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 = "7.1+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.7.1-dev" // version from git, output of $(git describe) + gitMinor string = "7.2" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.7.2" // 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 27f2adbd6e725969d42c0b100d7d33d5c85ee3cf Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Mon, 29 Dec 2014 11:05:11 -0800 Subject: [PATCH 3/3] Kubernetes version v0.7.2-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 e61517e18c3..c1df560a8c3 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 = "7.2" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.7.2" // version from git, output of $(git describe) + gitMinor string = "7.2+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.7.2-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" )