Ben Johnson 23dc0b9317 Merge branch '0.2' of https://github.com/coreos/etcd into versioning ...

Conflicts:
	server/v2/put_handler.go

2013-10-28 06:39:56 -06:00

..

v1

Internal versioning.

2013-10-27 14:09:40 -06:00

v2

Merge branch '0.2' of https://github.com/coreos/etcd into versioning

2013-10-28 06:39:56 -06:00

config_test.go

Add tiered configuration.

2013-10-21 21:37:25 -06:00

config.go

Merge branch '0.2' into config

2013-10-23 13:59:28 -06:00

info.go

Add tiered configuration.

2013-10-21 21:37:25 -06:00

join_command.go

Internal versioning.

2013-10-27 14:09:40 -06:00

package_stats.go

Refactor commands.

2013-10-11 01:02:38 -06:00

peer_server_handlers.go

Internal versioning.

2013-10-27 14:09:40 -06:00

peer_server.go

Internal versioning.

2013-10-27 14:09:40 -06:00

raft_follower_stats.go

Refactor commands.

2013-10-11 01:02:38 -06:00

raft_server_stats.go

Refactor commands.

2013-10-11 01:02:38 -06:00

registry.go

Internal versioning.

2013-10-27 14:09:40 -06:00

remove_command.go

Use raft.Server interface.

2013-10-14 13:51:20 -06:00

server.go

Internal versioning.

2013-10-27 14:09:40 -06:00

stats_queue.go

Refactored.

2013-10-12 15:56:43 -06:00

timeout.go

fix server/server.go accept name when creating a when server; gofmt

2013-10-13 10:44:40 -07:00

tls_config.go

Add tiered configuration.

2013-10-21 21:37:25 -06:00

tls_info.go

Add tiered configuration.

2013-10-21 21:37:25 -06:00

transporter_test.go

Add tiered configuration.

2013-10-21 21:37:25 -06:00

transporter.go

refactor use transtiemout

2013-10-21 17:53:24 -07:00

util.go

Merge branch '0.2' into config

2013-10-23 13:59:28 -06:00

version.go

Internal versioning.

2013-10-27 14:09:40 -06:00