From a91461424706a5435e6800d4c94d5b35065c1944 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 25 Mar 2015 23:45:45 -0700 Subject: [PATCH] Revert "Revert "Revert "profiles: enable etcd protocols 1 and 2""" This reverts commit 7610638477ae8172816302504749d38d5b1ea4b7. --- .../coreos-overlay/profiles/coreos/base/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 67f6d2c322..260c89a170 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -13,7 +13,7 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" # via use flags because if two versions are installed one must provide # the "default" /usr/bin/etcd binary and systemd services. USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS" -ETCD_PROTOCOLS="1 2" +ETCD_PROTOCOLS="1" # Extra use flags for CoreOS SDK USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb"