← Back to branch summary

~juju-qa/juju-ci-tools/trunk

« back to all changes in this revision

Viewing changes to deploy_stack.py

  • Committer: Christopher Lee
  • Date: 2016-10-26 04:59:52 UTC
  • mfrom: (1689 trunk)
  • mto: This revision was merged to the branch mainline in revision 1698.
  • Revision ID: chris.lee@canonical.com-20161026045952-g0l8ba05nmo5a638
Merge trunk. Fix conflict issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
deploy_stack.py
806
806
    def _should_dump(self):
807
807
        return not isinstance(self.client._backend, FakeBackend)
808
808
 
809
 
    def dump_all_logs(self):
 
809
    def dump_all_logs(self, patch_dir=None):
810
810
        """Dump logs for all models in the bootstrapped controller."""
811
811
        # This is accurate because we bootstrapped self.client.  It might not
812
812
        # be accurate for a model created by create_environment.