|
@ -57,7 +57,8 @@ export DEFAULT_COMPOSE_FILE |
|
|
## Merge YAML files |
|
|
## Merge YAML files |
|
|
## |
|
|
## |
|
|
|
|
|
|
|
|
_merge_yaml_common_code=" |
|
|
|
|
|
|
|
|
export _merge_yaml_common_code=" |
|
|
|
|
|
|
|
|
import sys |
|
|
import sys |
|
|
import yaml |
|
|
import yaml |
|
|
|
|
|
|
|
@ -141,7 +142,6 @@ def merge_cli(*args): |
|
|
if c is not None: |
|
|
if c is not None: |
|
|
print '%s' % yaml.dump(c, default_flow_style=False) |
|
|
print '%s' % yaml.dump(c, default_flow_style=False) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" |
|
|
" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|