From 9995e80a2cd383f356da3e904acc35d871883e08 Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Fri, 27 Mar 2015 16:53:55 -0700
Subject: [PATCH] Revert "etcdhttp: add internalVersion"

This reverts commit a77bf97c147a93e5b78898b427d081ba11b8f118.

Conflicts:
	version/version.go

Conflicts:
	version/version.go
---
 etcdserver/etcdhttp/client.go      | 2 +-
 etcdserver/etcdhttp/client_test.go | 2 +-
 version/version.go                 | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/etcdserver/etcdhttp/client.go b/etcdserver/etcdhttp/client.go
index 39d0fadf0..e372353aa 100644
--- a/etcdserver/etcdhttp/client.go
+++ b/etcdserver/etcdhttp/client.go
@@ -334,7 +334,7 @@ func serveVersion(w http.ResponseWriter, r *http.Request) {
 	if !allowMethod(w, r.Method, "GET") {
 		return
 	}
-	fmt.Fprintf(w, `{"releaseVersion":"%s","internalVersion":"%s"}`, version.Version, version.InternalVersion)
+	w.Write([]byte("etcd " + version.Version))
 }
 
 // parseKeyRequest converts a received http.Request on keysPrefix to
diff --git a/etcdserver/etcdhttp/client_test.go b/etcdserver/etcdhttp/client_test.go
index 67b9de232..2dec30dcc 100644
--- a/etcdserver/etcdhttp/client_test.go
+++ b/etcdserver/etcdhttp/client_test.go
@@ -1327,7 +1327,7 @@ func TestServeVersion(t *testing.T) {
 	if rw.Code != http.StatusOK {
 		t.Errorf("code=%d, want %d", rw.Code, http.StatusOK)
 	}
-	w := fmt.Sprintf(`{"releaseVersion":"%s","internalVersion":"%s"}`, version.Version, version.InternalVersion)
+	w := fmt.Sprintf("etcd %s", version.Version)
 	if g := rw.Body.String(); g != w {
 		t.Fatalf("body = %q, want %q", g, w)
 	}
diff --git a/version/version.go b/version/version.go
index c27404335..5e311ce42 100644
--- a/version/version.go
+++ b/version/version.go
@@ -23,8 +23,7 @@ import (
 )
 
 var (
-	Version         = "2.0.7+git"
-	InternalVersion = "2"
+	Version = "2.0.7+git"
 )
 
 // WalVersion is an enum for versions of etcd logs.