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

..

cmd

Fix up migration tool, add snapshot migration

2014-11-14 16:46:08 -05:00

etcd4pb

Fix up migration tool, add snapshot migration

2014-11-14 16:46:08 -05:00

fixtures

Fix up migration tool, add snapshot migration

2014-11-14 16:46:08 -05:00

config.go

Fix up migration tool, add snapshot migration

2014-11-14 16:46:08 -05:00

etcd4.go

Merge remote-tracking branch 'coreos/master' into merge

2014-11-21 15:40:11 -05:00

log_test.go

fix test import loop

2014-11-20 15:38:08 -05:00

log.go

fix import loop, add set to types, and fix comments

2014-11-20 15:38:08 -05:00

member.go

fix import loop, add set to types, and fix comments

2014-11-20 15:38:08 -05:00

snapshot.go

Merge remote-tracking branch 'coreos/master' into merge

2014-11-21 15:40:11 -05:00