Merge branch 'refactoring' of https://github.com/benbjohnson/etcd int…

…o refactoring Conflicts: server/registry.go
etcd-io · Oct 13, 2013 · 55c1f45 · 55c1f45
2 parents ec24e76 + 2b9c4bc
commit 55c1f45
Show file tree

Hide file tree

Showing 24 changed files with 955 additions and 965 deletions.
diff --git a/etcd_test.go b/etcd_test.go
@@ -32,7 +32,6 @@ func TestSingleNode(t *testing.T) {
 
 	time.Sleep(time.Second)
 
-	etcd.OpenDebug()
 	c := etcd.NewClient()
 
 	c.SyncCluster()

diff --git a/server/join_command.go b/server/join_command.go
@@ -14,18 +14,18 @@ func init() {
 
 // The JoinCommand adds a node to the cluster.
 type JoinCommand struct {
-	RaftVersion    string `json:"raftVersion"`
-	Name           string `json:"name"`
-	RaftURL        string `json:"raftURL"`
-	EtcdURL        string `json:"etcdURL"`
+	RaftVersion string `json:"raftVersion"`
+	Name        string `json:"name"`
+	RaftURL     string `json:"raftURL"`
+	EtcdURL     string `json:"etcdURL"`
 }
 
 func NewJoinCommand(version, name, raftUrl, etcdUrl string) *JoinCommand {
 	return &JoinCommand{
-		RaftVersion:    version,
-		Name:           name,
-		RaftURL:        raftUrl,
-		EtcdURL:        etcdUrl,
+		RaftVersion: version,
+		Name:        name,
+		RaftURL:     raftUrl,
+		EtcdURL:     etcdUrl,
 	}
 }