Created by Dan Ryan and last modified
Get this branch:
bzr branch lp:~techalchemy/mojo/fix-bundle-diff
Only Dan Ryan can upload to this branch. If you are Dan Ryan please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Dan Ryan
Mojo: Continuous Delivery for Juju

Recent revisions

548. By Dan Ryan

Merge with tip

547. By Dan Ryan

Fix ``bundle diff`` handling when using verbose mode

- Fix bundle-diff handling by avoiding the diff processor when using verbose mode
- Passing verbose output to the diff processor currently breaks mojo when using bundle

546. By Stuart Bishop

Reformat code with black

Reviewed-on: https://code.launchpad.net/~stub/mojo/blacken/+merge/382726
Reviewed-by: Tom Haddon <email address hidden>

545. By Tom Haddon

Add handling of JUJU_MODEL_CONFIG to git CI job

Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/model-config-git-ci-job/+merge/381988
Reviewed-by: Laurent Sesques <email address hidden>

544. By Paul Collins

better handling of bicommand vs stderr

Reviewed-on: https://code.launchpad.net/~pjdc/mojo/another-crack-at-bundle-output-mangling/+merge/381799
Reviewed-by: Stuart Bishop <email address hidden>

543. By Paul Collins

run_nagios_checks: report missing user and missing files separately

Reviewed-on: https://code.launchpad.net/~pjdc/mojo/nagios-check-reporting/+merge/381705
Reviewed-by: Tom Haddon <email address hidden>

542. By Paul Collins

fix test_show_for_deployer and test_process_config_changes_from_diff; and remove test_bicommand since getstatusoutput no longer exists

Reviewed-on: https://code.launchpad.net/~pjdc/mojo/fix-misc-tests/+merge/381708
Reviewed-by: Tom Haddon <email address hidden>

541. By Paul Collins

DeployerPhase.run: combine stderr with stdout

Reviewed-on: https://code.launchpad.net/~pjdc/mojo/more-bundle-output-mangling/+merge/381706
Reviewed-by: Tom Haddon <email address hidden>

540. By Paul Collins

fix fallout from bundle-diff --verbose

Reviewed-on: https://code.launchpad.net/~pjdc/mojo/bundle-fix-get-command-list-fallout/+merge/381551
Reviewed-by: Tom Haddon <email address hidden>

539. By Paul Collins

bundle-diff: support --verbose

Reviewed-on: https://code.launchpad.net/~pjdc/mojo/bundle-diff-verbose/+merge/381020
Reviewed-by: Stuart Bishop <email address hidden>

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.