Merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/mappings-dev-cleanup into lp://qastaging/ubuntu-openstack-ci
Proposed by
Ryan Beisner
| Status: | Merged |
|---|---|
| Merged at revision: | 144 |
| Proposed branch: | lp://qastaging/~1chb1n/ubuntu-openstack-ci/mappings-dev-cleanup |
| Merge into: | lp://qastaging/ubuntu-openstack-ci |
| Diff against target: |
1510 lines (+823/-282) 20 files modified
deployment/jobs/charm_amulet_test/config.xml (+1/-1) deployment/jobs/git-watch/config.xml (+13/-3) deployment/jobs/git_deploy_with_deployer/config.xml (+34/-3) deployment/jobs/mojo_runner/config.xml (+2/-0) deployment/jobs/mojo_runner_baremetal/config.xml (+1/-1) deployment/jobs/scheduled_trigger_deploy/config.xml (+3/-3) deployment/jobs/scheduled_trigger_lint/config.xml (+4/-5) deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml (+4/-2) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml (+124/-0) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml (+124/-0) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml (+124/-0) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml (+124/-0) deployment/jobs/scheduled_trigger_unit/config.xml (+2/-3) dev/mappings-dev.yaml (+237/-0) job-parts/osci_job_common.sh (+1/-1) populate/mappings.yaml (+12/-253) scan_merge_props.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/mappings-dev-cleanup |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ryan Beisner | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
