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

Merge pull request #2810 from jlowdermilk/release-0.6

Browse Source 
Create release 0.6.1
This commit is contained in:
Joe Beda
2014-12-09 10:26:13 -08:00
parent 20a0d79bf4 278e7ac232
commit d565885bf8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/docker/docker-defaults
View File

@@ -1,5 +1,5 @@
DOCKER_OPTS=""
{% if grains.docker_opts is defined %}
{% if grains.docker_opts %}
DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
{% endif %}
DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false"

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 = "6.0" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.6.0" // version from git, output of $(git describe)
gitMinor string = "6.1+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.6.1-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"
)