Browse Source

Merge pull request #1038 from philips/vegan-etcd

*: stop using 0xBEEF
Xiang Li 11 years ago
parent
commit
70443adc8d
2 changed files with 5 additions and 5 deletions
  1. 3 3
      Procfile
  2. 2 2
      wal/wal_test.go

+ 3 - 3
Procfile

@@ -1,3 +1,3 @@
-etcd0: ./etcd -id 0xBEEF0 -l :8080 -peers '0xBEEF0=localhost:8080&0xBEEF1=localhost:8081&0xBEEF2=localhost:8082'
-etcd1: ./etcd -id 0xBEEF1 -l :8081 -peers '0xBEEF0=localhost:8080&0xBEEF1=localhost:8081&0xBEEF2=localhost:8082'
-etcd2: ./etcd -id 0xBEEF2 -l :8082 -peers '0xBEEF0=localhost:8080&0xBEEF1=localhost:8081&0xBEEF2=localhost:8082'
+etcd0: ./etcd -id 0x0 -l :8080 -peers '0x0=localhost:8080&0x1=localhost:8081&0x2=localhost:8082'
+etcd1: ./etcd -id 0x1 -l :8081 -peers '0x0=localhost:8080&0x1=localhost:8081&0x2=localhost:8082'
+etcd2: ./etcd -id 0x2 -l :8082 -peers '0x0=localhost:8080&0x1=localhost:8081&0x2=localhost:8082'

+ 2 - 2
wal/wal_test.go

@@ -158,7 +158,7 @@ func TestRecover(t *testing.T) {
 	if err != nil {
 	if err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
-	i := &raftpb.Info{Id: int64(0xBEEF)}
+	i := &raftpb.Info{Id: int64(0xBAD0)}
 	if err = w.SaveInfo(i); err != nil {
 	if err = w.SaveInfo(i); err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
@@ -275,7 +275,7 @@ func TestRecoverAfterCut(t *testing.T) {
 	if err != nil {
 	if err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
-	info := &raftpb.Info{Id: int64(0xBEEF)}
+	info := &raftpb.Info{Id: int64(0xBAD1)}
 	if err = w.SaveInfo(info); err != nil {
 	if err = w.SaveInfo(info); err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}