From b76da2278c37b1e26e468e6abe83b162190bac8a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 13 Feb 2015 19:16:04 -0800 Subject: [PATCH 1/2] Revert "Merge pull request #1102 from crawford/cloudinit" This reverts commit 16d22e022ebaf1238d20287efc6f9aee7d363d50, reversing changes made to 7948a0d0e2fc22724cfa13c1098806a7e8e9e750. --- ...eos-cloudinit-1.3.1.ebuild => coreos-cloudinit-1.3.0.ebuild} | 0 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-1.3.1.ebuild => coreos-cloudinit-1.3.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.3.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.3.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.3.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.3.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index a6701f94c2..0170a1689f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="2fe0b0b2a8e85cedbc79d6f3d6ef2c1c13c2fdb3" # tag v1.3.1 + CROS_WORKON_COMMIT="18caa5bf07c89d17a1675a1b1be526c6f836ba09" # tag v1.3.0 KEYWORDS="amd64" fi From e3b6a70eaca82f34eaff406014fb37023eac23a6 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 13 Feb 2015 19:16:19 -0800 Subject: [PATCH 2/2] Revert "Merge pull request #1098 from crawford/cloudinit" This reverts commit 7fac1e1120a58865fbcca92de278fcc19b345714, reversing changes made to b2f74acf76bef7f00bf88cbabeae2f66e24fa4ef. --- ...eos-cloudinit-1.3.0.ebuild => coreos-cloudinit-1.2.1.ebuild} | 0 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-1.3.0.ebuild => coreos-cloudinit-1.2.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.2.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.3.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.2.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index 0170a1689f..d53ac343ca 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="18caa5bf07c89d17a1675a1b1be526c6f836ba09" # tag v1.3.0 + CROS_WORKON_COMMIT="ae3676096cabaaa5a65c4976ba31983833fb09ee" # tag v1.2.1 KEYWORDS="amd64" fi