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