Merge pull request #1164 from crawford/etcd

Revert "Revert "Revert "profiles: enable etcd protocols 1 and 2"""
This commit is contained in:
Alex Crawford 2015-03-25 23:59:31 -07:00
commit 19bfc189db

View File

@ -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 # via use flags because if two versions are installed one must provide
# the "default" /usr/bin/etcd binary and systemd services. # the "default" /usr/bin/etcd binary and systemd services.
USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS" USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS"
ETCD_PROTOCOLS="1 2" ETCD_PROTOCOLS="1"
# Extra use flags for CoreOS SDK # Extra use flags for CoreOS SDK
USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb" USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb"