3 Commits

Author SHA1 Message Date
Ben Johnson
4bec461db1 Refactor mod/lock. 2013-12-08 15:26:58 -07:00
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
Ben Johnson
e76b7d1e8b Add mod/lock version. 2013-12-04 22:24:04 -07:00