Merge pull request kubernetes#1786 from dchen1107/release

Release 0.4
duda · Oct 14, 2014 · 3f52a97 · 3f52a97
2 parents 0f91a66 + 06012ae
commit 3f52a97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Changelog
+
+## 0.4 (10/14/2014)
+ - Support Persistent Disk volume type
diff --git 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 = "3+"             // minor version, numeric possibly followed by "+"
-	gitVersion   string = "v0.3-dev"       // version from git, output of $(git describe)
+	gitMinor     string = "4+"             // minor version, numeric possibly followed by "+"
+	gitVersion   string = "v0.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"
 )