@@ -17,14 +17,14 @@ Start an etcd server for testing.

 .PP

 This command starts an etcd server based on the config for testing.  It is not

-Intended for production use.  Running

+intended for production use.  Running

 .PP

 openshift start etcd

 .PP

-will start the server listening for incoming requests. The server

-will run in the foreground until you terminate the process.

+will start the server listening for incoming requests. The server will run in

+the foreground until you terminate the process.

 .SH OPTIONS

@@ -695,8 +695,8 @@ function os::build::os_version_vars() {

 readonly -f os::build::os_version_vars

 function os::build::etcd_version_vars() {

-  ETCD_GIT_COMMIT=$(go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "github.com/coreos/etcd/client" "comment")

-  ETCD_GIT_VERSION=$(echo "${ETCD_GIT_COMMIT}" | sed -E "s/\-.*/\+git/g" | sed -E "s/v//")

+  ETCD_GIT_VERSION=$(go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "github.com/coreos/etcd/etcdserver" "comment")

+  ETCD_GIT_COMMIT=$(go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "github.com/coreos/etcd/etcdserver")

 }

 readonly -f os::build::etcd_version_vars

@@ -23,10 +23,6 @@ fi

 # setup a private GOPATH so the build can succeed

 export GOPATH="${PWD}/gopath"

-rm -f "${GOPATH}/src/github.com/coreos/etcd"

-mkdir -p "${GOPATH}/src/github.com/coreos"

-ln -s "${PWD}" "${GOPATH}/src/github.com/coreos/etcd"

-

 ./build

 echo

@@ -26,7 +26,8 @@ os::test::junit::declare_suite_start "cmd/basicresources/versionreporting"

 os::build::get_version_vars

 os_git_regex="$( escape_regex "${OS_GIT_VERSION%%-*}" )"

 kube_git_regex="$( escape_regex "${KUBE_GIT_VERSION%%-*}" )"

-etcd_git_regex="$( escape_regex "${ETCD_GIT_VERSION%%-*}" )"

+etcd_version="$(echo "${ETCD_GIT_VERSION}" | sed -E "s/\-.*//g" | sed -E "s/v//")"

+etcd_git_regex="$( escape_regex "${etcd_version%%-*}" )"

 os::cmd::expect_success_and_text 'oc version' "oc ${os_git_regex}"

 os::cmd::expect_success_and_text 'oc version' "kubernetes ${kube_git_regex}"

 os::cmd::expect_success_and_text 'oc version' "features: Basic-Auth"