Skip to content

Commit

Permalink
Merge 49ad1fd into 2d86941
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanKrall committed Oct 23, 2020
2 parents 2d86941 + 49ad1fd commit 62b6768
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion paasta_tools/cli/cmds/mark_for_deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,10 @@ def _run_instance_worker(cluster_data, instances_out, green_light):
try:
if status.marathon:
long_running_status = status.marathon
elif status.kubernetes:
except ApiAttributeError:
pass
try:
if status.kubernetes:
long_running_status = status.kubernetes
except ApiAttributeError:
pass
Expand Down

0 comments on commit 62b6768

Please sign in to comment.