Merge pull request #233 from bdarnell/update-etcd

Update etcd subrepo and update WriteableGroupStorage interface.
cockroachdb · Dec 16, 2014 · 9fb4949 · 9fb4949
2 parents d24a33a + 4869cab
commit 9fb4949
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/_vendor/src/github.com/coreos/etcd b/_vendor/src/github.com/coreos/etcd
diff --git a/multiraft/storage.go b/multiraft/storage.go
@@ -29,7 +29,7 @@ import (
 // It is implemented by *raft.MemoryStorage.
 type WriteableGroupStorage interface {
 	raft.Storage
-	Append(entries []raftpb.Entry)
+	Append(entries []raftpb.Entry) error
 	SetHardState(st raftpb.HardState) error
 }
 

diff --git a/multiraft/storage_test.go b/multiraft/storage_test.go
@@ -50,9 +50,9 @@ type blockableGroupStorage struct {
 	s WriteableGroupStorage
 }
 
-func (b *blockableGroupStorage) Append(entries []raftpb.Entry) {
+func (b *blockableGroupStorage) Append(entries []raftpb.Entry) error {
 	b.b.wait()
-	b.s.Append(entries)
+	return b.s.Append(entries)
 }
 
 func (b *blockableGroupStorage) SetHardState(st raftpb.HardState) error {
+1 −0		.travis.yml
+16 −1		Documentation/0.5/clustering.md
+8 −0		Documentation/0.5/configuration.md
+22 −6		Documentation/api.md
+28 −24		Documentation/configuration.md
+1 −0		Documentation/libraries-and-tools.md
+3 −1		Documentation/modules.md
+1 −1		build
+15 −7		client/keys.go
+17 −7		client/keys_test.go
+25 −20		discovery/discovery.go
+27 −7		discovery/discovery_test.go
+1 −1		etcdctl/command/backup_command.go
+11 −5		etcdmain/etcd.go
+21 −0		etcdmain/http.go
+3 −9		etcdserver/config.go
+8 −2		etcdserver/etcdhttp/client.go
+14 −2		etcdserver/sendhub.go
+24 −42		etcdserver/server.go
+8 −0		etcdserver/stats/server.go
+11 −0		etcdserver/stats/stats.go
+45 −0		etcdserver/storage.go
+2 −3		migrate/etcd4.go
+0 −2		migrate/log.go
+60 −0		pkg/fileutil/lock.go
+82 −0		pkg/fileutil/lock_test.go
+19 −2		pkg/fileutil/purge.go
+69 −1		pkg/fileutil/purge_test.go
+1 −1		pkg/transport/timeout_dialer_test.go
+1 −1		pkg/transport/timeout_listener_test.go
+7 −2		raft/log.go
+25 −21		raft/raft.go
+37 −54		raft/raft_test.go
+4 −3		raft/storage.go
+31 −0		rafthttp/batcher.go
+97 −39		rafthttp/sender.go
+8 −8		rafthttp/sender_test.go
+8 −8		rafthttp/streamer.go
+33 −0		scripts/build-aci
+2 −1		store/node.go
+1 −1		test
+1 −1		version/version.go
+1 −1		wal/doc.go
+15 −7		wal/util.go
+81 −4		wal/wal.go
+8 −6		wal/wal_test.go