github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 11:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3160 from jbeda/release-0.7

Browse Source 
Cut v0.7.2 with cadvisor manifest fix
This commit is contained in:
Vish Kannan
2014-12-29 11:45:24 -08:00
parent d7ab7bef97 27f2adbd6e
commit ff7eb21058
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/cadvisor/cadvisor.manifest
View File

@@ -26,7 +26,7 @@ volumes:
source:
hostDir:
path: /var/lib/docker
- name: cgroups
- name: sysfs
source:
hostDir:
path: /sys/fs/cgroup
path: /sys

4
pkg/version/base.go
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 = "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-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"
)