summaryrefslogtreecommitdiffstats
path: root/rel-eng
diff options
context:
space:
mode:
authorTroy Dawson <tdawson@redhat.com>2015-05-21 14:10:35 -0500
committerTroy Dawson <tdawson@redhat.com>2015-05-21 14:10:35 -0500
commitc3bd6a3489dd0473334543024efa2c3c96ba8be2 (patch)
tree6cbc6c67bcefea2ed964c4fbda0aa47c3a2b067c /rel-eng
parent1d8e743921a48a5abd2ca75323321f6db261101b (diff)
parentb151e33e7e49d1de1c58286342d09cc9eba57287 (diff)
downloadopenshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.gz
openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.bz2
openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.xz
openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.zip
Merge branch 'master' into int
Diffstat (limited to 'rel-eng')
-rw-r--r--rel-eng/packages/openshift-ansible-bin2
-rw-r--r--rel-eng/packages/openshift-ansible-inventory2
2 files changed, 2 insertions, 2 deletions
diff --git a/rel-eng/packages/openshift-ansible-bin b/rel-eng/packages/openshift-ansible-bin
index 8a9624397..de9bb5157 100644
--- a/rel-eng/packages/openshift-ansible-bin
+++ b/rel-eng/packages/openshift-ansible-bin
@@ -1 +1 @@
-0.0.12-1 bin/
+0.0.17-1 bin/
diff --git a/rel-eng/packages/openshift-ansible-inventory b/rel-eng/packages/openshift-ansible-inventory
index cf3ac87ed..df529d9fd 100644
--- a/rel-eng/packages/openshift-ansible-inventory
+++ b/rel-eng/packages/openshift-ansible-inventory
@@ -1 +1 @@
-0.0.2-1 inventory/
+0.0.7-1 inventory/