Ben Johnson 8952c1bd42 Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config ...

Conflicts:
	etcd.go

2013-11-19 08:28:46 -07:00

..

etcd_direct_call.go

Reintegrate functional tests into etcd.

2013-10-16 13:58:03 -06:00

init.go

Reintegrate functional tests into etcd.

2013-10-16 13:58:03 -06:00

internal_version_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

kill_leader_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

kill_random_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

multi_node_kill_all_and_recovery_test.go

fix tests

2013-11-09 21:17:32 -08:00

multi_node_kill_one_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

remove_node_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

simple_multi_node_test.go

tests loosen the ttl checking

2013-11-14 20:09:12 -08:00

simple_snapshot_test.go

Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config

2013-11-19 08:28:46 -07:00

single_node_recovery_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

single_node_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

util.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

v1_migration_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

version_check_test.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00