From a0bb403a1d677e6188d576905d44731b5a8ecdee Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 10 Feb 2014 20:23:11 -0800 Subject: [PATCH 1/2] fix(coreos-base/coreos): Add fleet to production images. --- ...ental-0.0.1-r4.ebuild => coreos-experimental-0.0.1-r5.ebuild} | 0 .../coreos-experimental/coreos-experimental-0.0.1.ebuild | 1 - .../{coreos-0.0.1-r216.ebuild => coreos-0.0.1-r217.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + 4 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/{coreos-experimental-0.0.1-r4.ebuild => coreos-experimental-0.0.1-r5.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r216.ebuild => coreos-0.0.1-r217.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1-r5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild index 59734c95ab..f5dc858e90 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild @@ -14,5 +14,4 @@ IUSE="" DEPEND="" RDEPEND=" - app-admin/fleet " diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r216.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r217.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r216.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r217.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 23100c9e6a..d63587f993 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -96,6 +96,7 @@ RDEPEND="${RDEPEND} RDEPEND="${RDEPEND} sys-apps/findutils sys-apps/which + app-admin/fleet app-admin/sudo app-arch/gzip app-arch/tar From d540538172486d569caf199197acaecd5425c87c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 10 Feb 2014 22:32:46 -0800 Subject: [PATCH 2/2] bump(dev-db/etcd): Update to include v1 API fix Includes a few other changes which are either bug fixes or doc updates: Brandon Philips (4): bump(README): increase the version of the README to 0.3.0 fix(README): move contact closer to contributing feat(scripts): use zip for windows and darwin fix(server/v1): don't fail put on new v1 key Brian Waldon (3): doc(CompareAndDelete): Add missing CAD docs doc(CompareAndSwap): clarify prevIndex in CAS chore(gofmt): gofmt compare_and_delete_command.go Jan-Erik Rediger (1): Change token example to use returned value only Michael Marineau (1): add(server/v1/tests): Port many of the v2 HTTP handler tests to v1 TANABE Ken-ichi (2): fix(mod/lock): Use dedicated channel to shutdown goroutine properly fix(mod/lock): Use CreatedIndex in the first node to watch --- .../dev-db/etcd/{etcd-0.3.0-r1.ebuild => etcd-0.3.0-r2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.3.0-r1.ebuild => etcd-0.3.0-r2.ebuild} (90%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r2.ebuild similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r2.ebuild index 1989e9d6e6..6b79cc6600 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r2.ebuild @@ -9,7 +9,7 @@ EAPI=4 CROS_WORKON_PROJECT="coreos/etcd" CROS_WORKON_LOCALNAME="etcd" CROS_WORKON_REPO="git://github.com" -CROS_WORKON_COMMIT="f9d27c37aa9bc12a51a6675e93cae454415aa3fa" # v0.3.0 tag +CROS_WORKON_COMMIT="040c1f591efa735e24e794d5084ad07782123e3c" # v0.3.0 + v1 API fix inherit toolchain-funcs cros-workon systemd DESCRIPTION="etcd"