summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-30 09:44:21 -0700
committerGitHub <noreply@github.com>2017-10-30 09:44:21 -0700
commit416282af74b086cd800a88ffea6e011dd4ed9e12 (patch)
treeedbbf84d2c3e9b39b52cce2c718143507c106464 /inventory
parent0b0dea682dfc957651c035eb822afe89d16895af (diff)
parent58357db1b6b6f04f27721c1b9f986325a470c773 (diff)
downloadopenshift-416282af74b086cd800a88ffea6e011dd4ed9e12.tar.gz
openshift-416282af74b086cd800a88ffea6e011dd4ed9e12.tar.bz2
openshift-416282af74b086cd800a88ffea6e011dd4ed9e12.tar.xz
openshift-416282af74b086cd800a88ffea6e011dd4ed9e12.zip
Merge pull request #5867 from chinacoolhacker/master
Automatic merge from submit-queue. GlusterFS suppot for OpenShift v1.5 Added files and templates for OpenShift v1.5
Diffstat (limited to 'inventory')
0 files changed, 0 insertions, 0 deletions