Skip to content

Commit

Permalink
Merge pull request #10 from KohlsTechnology/emptyannotation
Browse files Browse the repository at this point in the history
Merge Kohl's Custom Changes Into Master Branch
  • Loading branch information
seanmalloy authored May 6, 2020
2 parents f5b024f + 6db8c0e commit 5c2abd5
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions library/openshift_provision.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,12 @@ def compare_set_list(path, src, dst):
return list(compare_values(['/' + field], current, config))

def set_dict_defaults(d, default):
for k, v in default.items():
if k not in d:
d[k] = v
if d is None:
d = default.items()
else:
for k, v in default.items():
if k not in d:
d[k] = v

def normalize_cpu_units(cpu):
cpu = str(cpu)
Expand Down

0 comments on commit 5c2abd5

Please sign in to comment.