Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: mod/lock #347

Merged
merged 11 commits into from
Dec 5, 2013
Merged

WIP: mod/lock #347

merged 11 commits into from
Dec 5, 2013

Commits on Nov 19, 2013

  1. mod_lock

    @benbjohnson
    benbjohnson committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    228754a View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2013

  1. mod/lock

    @benbjohnson
    benbjohnson committed Nov 27, 2013
    Configuration menu
    Copy the full SHA
    3286124 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	mod/mod.go
    @benbjohnson
    benbjohnson committed Nov 27, 2013
    Configuration menu
    Copy the full SHA
    74ad50e View commit details
    Browse the repository at this point in the history

  3. Initial mod_lock acquire.

    @benbjohnson
    benbjohnson committed Nov 27, 2013
    Configuration menu
    Copy the full SHA
    22c2935 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2013

  1. Lock testing.

    @benbjohnson
    benbjohnson committed Nov 29, 2013
    Configuration menu
    Copy the full SHA
    d8e9838 View commit details
    Browse the repository at this point in the history

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

    @benbjohnson
    benbjohnson committed Nov 29, 2013
    Configuration menu
    Copy the full SHA
    03571d3 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2013

  1. Fix test harness.

    @benbjohnson
    benbjohnson committed Dec 2, 2013
    Configuration menu
    Copy the full SHA
    df20be7 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2013

  1. Add mod/lock connection monitoring.

    @benbjohnson
    benbjohnson committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    f3d438a View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2013

  1. Add mod/lock version.

    @benbjohnson
    benbjohnson committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    e76b7d1 View commit details
    Browse the repository at this point in the history

  2. 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
    @benbjohnson
    benbjohnson committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    5d865e3 View commit details
    Browse the repository at this point in the history

  3. Update mod/lock versioning.

    @benbjohnson
    benbjohnson committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    b784ced View commit details
    Browse the repository at this point in the history