Ben Johnson 5d865e321c Merge branch 'master' of https://github.com/coreos/etcd into mod-lock ...

Conflicts:
	server/v2/tests/delete_handler_test.go
	server/v2/tests/get_handler_test.go
	server/v2/tests/post_handler_test.go
	server/v2/tests/put_handler_test.go
	third_party/github.com/coreos/go-etcd/etcd/requests.go

2013-12-04 22:36:53 -07:00

..

v1

bump deps

2013-11-22 08:59:24 -08:00

v2

Merge branch 'master' of https://github.com/coreos/etcd into mod-lock

2013-12-04 22:36:53 -07:00

config_test.go

Config clean up and usage messaging.

2013-11-20 10:52:01 -07:00

config.go

fix(etcd): fixup the name and data dir guessing

2013-11-27 12:20:26 -08:00

cors_handler.go

feat(server): introduce a cors handler

2013-11-21 09:25:21 -08:00

info.go

Config fixes.

2013-11-19 09:20:20 -07:00

join_command.go

bump deps

2013-11-22 08:59:24 -08:00

package_stats.go

Refactor commands.

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

peer_server_handlers.go

bump deps

2013-11-22 08:59:24 -08:00

peer_server.go

bump deps

2013-11-22 08:59:24 -08:00

raft_follower_stats.go

Refactor commands.

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

raft_server_stats.go

bump deps

2013-11-22 08:59:24 -08:00

registry.go

Fix test harness.

2013-12-02 15:43:37 -07:00

remove_command.go

bump deps

2013-11-22 08:59:24 -08:00

server.go

Merge branch 'master' of https://github.com/coreos/etcd into mod-lock

2013-12-04 22:36:53 -07: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

feat add snapCount parameter

2013-10-30 17:36:15 -07:00

tls_info.go

fix dep issue

2013-11-22 13:27:04 -08:00

transporter_test.go

chore(*.go): add copyright notice

2013-11-08 14:04:15 -08:00

transporter.go

bump deps

2013-11-22 08:59:24 -08:00

usage.go

fix(server/usage): fixup the usage based on feedback

2013-12-02 18:41:03 -08:00

util.go

Renamed configuration parameters.

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

version.go

feat add snapCount parameter

2013-10-30 17:36:15 -07:00