@@ -48,9 +48,7 @@ func main() {

 		Use:   "version",

 		Short: "Display version",

 		Run: func(c *cobra.Command, args []string) {

-			info := version.Get()

-			major, minor, git := info.Major, info.Minor, info.GitCommit

-			fmt.Printf("openshift version %s.%s, build %s\n", major, minor, git)

+			fmt.Printf("openshift %v\n", version.Get())

 			fmt.Printf("kubernetes %v\n", kubeversion.Get())

 		},

 	}

@@ -28,4 +28,4 @@ for arg; do

   binaries+=("${OS_GO_PACKAGE}/${arg}")

 done

-go install -ldflags "-X github.com/openshift/origin/pkg/version.commitFromGit '${version}' -X github.com/GoogleComputePlatform/kubernetes/pkg/version.commitFromGit '${kube_version}'" "${binaries[@]}"

+go install -ldflags "-X github.com/GoogleCloudPlatform/kubernetes/pkg/version.commitFromGit '${kube_version}' -X github.com/openshift/origin/pkg/version.commitFromGit '${version}'" "${binaries[@]}"

@@ -40,6 +40,9 @@ func main() {

 		if dep.ImportPath != pkg {

 			continue

 		}

+		if len(dep.Rev) > 7 {

+			dep.Rev = dep.Rev[0:7]

+		}

 		fmt.Fprintf(os.Stdout, dep.Rev)

 		return

 	}