etcd/etcdserver
Ben Darnell 0d680d0e6b Merge remote-tracking branch 'coreos/master' into merge
* coreos/master:
  rafthttp: fix import
  raft: should not decrease match and next when handling out of order msgAppResp
  Fix migration to allow snapshots to have the right IDs
  add snapshotted integration test
  fix test import loop
  fix import loop, add set to types, and fix comments
  etcdserver: autodetect v0.4 WALs and upgrade them to v0.5 automatically
  wal: add a bench for write entry
  rafthttp: add streaming server and client
  dep: use vendored imports in codegangsta/cli
  dep: bump golang.org/x/net/context

Conflicts:
	etcdserver/server.go
	etcdserver/server_test.go
	migrate/snapshot.go
2014-11-21 15:40:11 -05:00
..
etcdhttp Merge pull request #1755 from bcwaldon/golang.org-deps 2014-11-20 16:26:14 -08:00
etcdserverpb *: generate clusterid 2014-10-20 15:00:54 -07:00
stats *: clean log.Print 2014-10-30 18:15:53 -07:00
cluster.go etcdserver: refactor ValidateClusterAndAssignIDs 2014-11-17 14:23:37 -08:00
cluster_test.go etcdserver: refactor ValidateClusterAndAssignIDs 2014-11-17 14:23:37 -08:00
config.go *: print out configuration when necessary 2014-11-13 10:46:42 -08:00
config_test.go etcdserver: move peer URLs check to config 2014-11-12 13:12:49 -08:00
example_test.go *: add license header to all source files 2014-10-17 15:41:22 -07:00
force_cluster.go raft: Integrate snapshots into the raft.Storage interface. 2014-11-19 16:40:26 -05:00
force_cluster_test.go raft: Integrate snapshots into the raft.Storage interface. 2014-11-19 16:40:26 -05:00
member.go Fix up migration tool, add snapshot migration 2014-11-14 16:46:08 -05:00
member_test.go etcdserver: remove unnecessary newTestMemberp 2014-11-11 11:09:33 -08:00
sendhub.go rafthttp: add streaming server and client 2014-11-20 11:34:50 -08:00
sendhub_test.go rafthttp: add streaming server and client 2014-11-20 11:34:50 -08:00
server.go Merge remote-tracking branch 'coreos/master' into merge 2014-11-21 15:40:11 -05:00
server_test.go Merge remote-tracking branch 'coreos/master' into merge 2014-11-21 15:40:11 -05:00