summaryrefslogtreecommitdiffstats
path: root/conftest.py
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-06 07:41:07 -0800
committerGitHub <noreply@github.com>2018-02-06 07:41:07 -0800
commita88f746600b1d38232630abef4ea0e83caae0ddb (patch)
tree2860f1d944c73b6adba07cd8a5900b4f19953e71 /conftest.py
parenta06bc5b19875e7ac665c8c7c6b8400d1f4de0f79 (diff)
parent4edcb3af15857f8b971e79bdde58224d115fd926 (diff)
downloadopenshift-a88f746600b1d38232630abef4ea0e83caae0ddb.tar.gz
openshift-a88f746600b1d38232630abef4ea0e83caae0ddb.tar.bz2
openshift-a88f746600b1d38232630abef4ea0e83caae0ddb.tar.xz
openshift-a88f746600b1d38232630abef4ea0e83caae0ddb.zip
Merge pull request #6975 from pgier/bz1540799
Automatic merge from submit-queue. bug 1540799: openshift_prometheus: update alertmanager config file flag Prometheus alertmanager as of 0.13.0 requires double dashes (posix) for command line flags. The double dashes should be backwards compat with earlier versions of alertmanager.
Diffstat (limited to 'conftest.py')
0 files changed, 0 insertions, 0 deletions