Ben Darnell 0d680d0e6b Merge remote-tracking branch 'coreos/master' into merge 11 rokov pred
..
cmd 192f200d9e Fix up migration tool, add snapshot migration 11 rokov pred
etcd4pb 192f200d9e Fix up migration tool, add snapshot migration 11 rokov pred
fixtures 192f200d9e Fix up migration tool, add snapshot migration 11 rokov pred
config.go 192f200d9e Fix up migration tool, add snapshot migration 11 rokov pred
etcd4.go 0d680d0e6b Merge remote-tracking branch 'coreos/master' into merge 11 rokov pred
log.go 59a0c64e9f fix import loop, add set to types, and fix comments 11 rokov pred
log_test.go d1e7fee3ca fix test import loop 11 rokov pred
member.go 59a0c64e9f fix import loop, add set to types, and fix comments 11 rokov pred
snapshot.go 0d680d0e6b Merge remote-tracking branch 'coreos/master' into merge 11 rokov pred