Ben Darnell 0d680d0e6b Merge remote-tracking branch 'coreos/master' into merge %!s(int64=11) %!d(string=hai) anos
..
cmd 192f200d9e Fix up migration tool, add snapshot migration %!s(int64=11) %!d(string=hai) anos
etcd4pb 192f200d9e Fix up migration tool, add snapshot migration %!s(int64=11) %!d(string=hai) anos
fixtures 192f200d9e Fix up migration tool, add snapshot migration %!s(int64=11) %!d(string=hai) anos
config.go 192f200d9e Fix up migration tool, add snapshot migration %!s(int64=11) %!d(string=hai) anos
etcd4.go 0d680d0e6b Merge remote-tracking branch 'coreos/master' into merge %!s(int64=11) %!d(string=hai) anos
log.go 59a0c64e9f fix import loop, add set to types, and fix comments %!s(int64=11) %!d(string=hai) anos
log_test.go d1e7fee3ca fix test import loop %!s(int64=11) %!d(string=hai) anos
member.go 59a0c64e9f fix import loop, add set to types, and fix comments %!s(int64=11) %!d(string=hai) anos
snapshot.go 0d680d0e6b Merge remote-tracking branch 'coreos/master' into merge %!s(int64=11) %!d(string=hai) anos