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

Conflicts:
	mod/mod.go
Initial mod_lock acquire.
Lock testing.
Merge branch 'master' of https://github.com/coreos/etcd into mod-lock
Fix test harness.
fix redirect url should include rawquery
fix(README): use the new response format

update all of the examples to use the new response format.
Merge pull request #368 from philips/cleanup-responses

fix(README): use the new response format
fix(README): prettify json

fixed using vim and python -m json.tool
Merge pull request #369 from philips/format-json

fix(README): prettify json
Add mod/lock connection monitoring.
Add mod/lock version.
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
Update mod/lock versioning.
fix(Dockerfile): remove bogus -bind-addr, and use default -addr
Merge pull request #371 from polvi/dockerfile

fix(Dockerfile): remove bogus -bind-addr, and use default -addr
Merge pull request #347 from benbjohnson/mod-lock

WIP: mod/lock
fix(etcd): Fix forced config reset

When a server name or a data directory were not provided, the
reset functionality would fail to clear out config files from
the appropriate place. This calcualtes the default server name
and data directory before reset is called.