diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-28 08:52:20 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-28 08:52:20 -0300 |
commit | dd2506e325d1a2858da353f96251f093e94bbcf3 (patch) | |
tree | 132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /roles/openshift_facts | |
parent | f004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff) | |
parent | bf520e46e6916a4c9995ea95fa40cdd25f31209e (diff) | |
download | openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2 openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip |
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 43cca90d6..66ad74cab 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1777,7 +1777,7 @@ class OpenShiftFacts(object): metrics=dict( deploy=False, duration=7, - resolution=10, + resolution='10s', storage=dict( kind=None, volume=dict( |