Merge pull request kubernetes#1251 from filbranden/version_string1

Use just GitVersion for the -version output
duda · Sep 9, 2014 · 9ffe6c0 · 9ffe6c0
2 parents 4891367 + 8de322f
commit 9ffe6c0
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -16,10 +16,6 @@ limitations under the License.
 
 package version
 
-import (
-	"fmt"
-)
-
 // Info contains versioning information.
 // TODO: Add []string of api versions supported? It's still unclear
 // how we'll want to distribute that information.
@@ -47,9 +43,5 @@ func Get() Info {
 
 // String returns info as a human-friendly version string.
 func (info Info) String() string {
-	commit := info.GitCommit
-	if commit == "" {
-		commit = "(unknown)"
-	}
-	return fmt.Sprintf("version %s.%s, build %s", info.Major, info.Minor, commit)
+	return info.GitVersion
 }