lp:~techalchemy/mojo/fix-bundle-diff

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mojo

Stuart Bishop (community): Needs Fixing on 2020-07-13

Canonical IS Reviewers: Pending requested 2020-05-05

Diff: 66 lines (+20/-7)

1 file modified

mojo/phase.py (+20/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

548. By Dan Ryan on 2020-05-05

Merge with tip

547. By Dan Ryan on 2020-05-05

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
  files

546. By Stuart Bishop on 2020-04-22

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 on 2020-04-16

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 on 2020-04-08

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 on 2020-04-06

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 on 2020-04-06

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 on 2020-04-06

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 on 2020-04-03

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 on 2020-03-30

bundle-diff: support --verbose

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