From c04fa504226b0fac26f0ace9a47d59f3637093f0 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 23 Mar 2015 19:49:36 -0700 Subject: [PATCH] Revert "Revert "profiles: enable etcd protocols 1 and 2"" This reverts commit 00d4ac172234b3707455e6a084babef7f852137b. --- .../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 260c89a170..67f6d2c322 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" +ETCD_PROTOCOLS="1 2" # Extra use flags for CoreOS SDK USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb"