diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-03 14:37:27 -0400 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-03 14:37:27 -0400 |
commit | 9d05b8c192a462c9d6a37586fc27cbd93f80ff65 (patch) | |
tree | 85696c092269859010348ede6fe80ba4c1124543 /roles/etcd_ca/meta | |
parent | ab83e16dbed3eb5cf1dff96992509439d2739550 (diff) | |
parent | 3d3f2875bb89cdbdeadd7da4868355669ba12122 (diff) | |
download | openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.tar.gz openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.tar.bz2 openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.tar.xz openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.zip |
Merge remote-tracking branch 'upstream/master' into upgrade
Diffstat (limited to 'roles/etcd_ca/meta')
-rw-r--r-- | roles/etcd_ca/meta/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/etcd_ca/meta/main.yml b/roles/etcd_ca/meta/main.yml index fb9280c9e..d02456ca3 100644 --- a/roles/etcd_ca/meta/main.yml +++ b/roles/etcd_ca/meta/main.yml @@ -13,4 +13,4 @@ galaxy_info: - cloud - system dependencies: -- { role: openshift_repos } +- { role: etcd_common } |