From 053a7ff6b78453fcff75d5f572e91b122e832884 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Tue, 11 Feb 2014 13:53:54 -0700 Subject: [PATCH 1/2] fix(etcd-bootstrap): Properly check for c10n peers --- .../third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap index 38d442cfee..12a17739af 100755 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap @@ -28,7 +28,7 @@ if [ -e $BOOTSTRAP_DISCO ]; then elif [ -e $BOOTSTRAP_PEERS ]; then IPS=$(grep -v $MY_IP $BOOTSTRAP_PEERS | grep -v '^\n$' | sed 's/$/:7001/'| tr '\n' ','| sed 's/^,//' | sed 's/,$//') - if [ -z "$IPS" ]; then + if [ -n "$IPS" ]; then ARGS="${ARGS} -C ${IPS}" fi else From ffac3c3f624245e18fd65219ade1fe6db1198c1c Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Tue, 11 Feb 2014 13:54:36 -0700 Subject: [PATCH 2/2] bump(etcd): inc etcd ebuild rev --- .../dev-db/etcd/{etcd-0.3.0-r2.ebuild => etcd-0.3.0-r3.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.3.0-r2.ebuild => etcd-0.3.0-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r3.ebuild