Merge lp://qastaging/~sidnei/juju-deployer/build-command into lp://qastaging/~gandelman-a/juju-deployer/trunk

Proposed by Sidnei da Silva
Status: Merged
Merged at revision: 68
Proposed branch: lp://qastaging/~sidnei/juju-deployer/build-command
Merge into: lp://qastaging/~gandelman-a/juju-deployer/trunk
Diff against target: 740 lines (+192/-109)
2 files modified
deployer.py (+76/-52)
utils.py (+116/-57)
To merge this branch: bzr merge lp://qastaging/~sidnei/juju-deployer/build-command
Reviewer Review Type Date Requested Status
Adam Gandelman Pending
Review via email: mp+151035@code.qastaging.launchpad.net

Commit message

- Add minimal support for a 'build' step after fetching the charm source
- Resolve includes as relative to the config files provided on command line if they are relative paths
- General code cleanup to conform to pep8

Description of the change

- Add minimal support for a 'build' step after fetching the charm source
- Resolve includes as relative to the config files provided on command line if they are relative paths
- General code cleanup to conform to pep8

To post a comment you must log in.
67. By Sidnei da Silva

- Merge from trunk, resolve conflicts

68. By Sidnei da Silva

- Fix bad merge

69. By Sidnei da Silva

- Also set non-include options.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches