diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-30 14:22:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 14:22:06 -0700 |
| commit | f4724095b84de7dfd88df2541941edf5d674ffd8 (patch) | |
| tree | 2db2db4291f584eb52a1b32da35f62f69c1cad11 /pytest.ini | |
| parent | f5594776a2cde617316597f5d4a5ffe85dfc8b18 (diff) | |
| parent | 041cfa825275ab9e03c58bdf8899254fbbc9f1e1 (diff) | |
| download | openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.tar.gz openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.tar.bz2 openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.tar.xz openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.zip | |
Merge pull request #5915 from sdodson/bz1507061
Automatic merge from submit-queue.
Correctly install cockpit
Seems this was changed inadvertantly in #5378
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1507061
Diffstat (limited to 'pytest.ini')
0 files changed, 0 insertions, 0 deletions