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

..

fixtures

Add v1.solo migration fixture.

2013-11-04 13:56:02 -07:00

functional

fix tests bump deps

2013-12-01 17:24:30 -05:00

mock

fix(server/v2): redirect to ClientURL not PeerURL

2013-12-02 18:20:11 -08:00

http_utils.go

Renamed configuration parameters.

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

server_utils.go

Initial mod_lock acquire.

2013-11-27 16:59:05 -07:00