Merge lp://staging/~aisrael/charm-tools/lp1305337 into lp://staging/charm-tools/1.6
Proposed by
Adam Israel
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~aisrael/charm-tools/lp1305337 |
| Merge into: | lp://staging/charm-tools/1.6 |
| Diff against target: |
475 lines (+107/-41) 15 files modified
Makefile (+6/-3) README.md (+11/-1) charmtools/__init__.py (+14/-0) charmtools/charms.py (+1/-0) charmtools/create.py (+6/-0) charmtools/get.py (+1/-0) charmtools/info.py (+7/-5) charmtools/proof.py (+12/-6) charmtools/review.py (+10/-3) charmtools/search.py (+7/-3) charmtools/subscribers.py (+4/-0) charmtools/test.py (+11/-2) charmtools/update.py (+4/-4) setup.py (+1/-5) tests/test_charm_get.py (+12/-9) |
| To merge this branch: | bzr merge lp://staging/~aisrael/charm-tools/lp1305337 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charm Toolers | Pending | ||
|
Review via email:
|
|||
Description of the change
This merge fixes lp:1305337 and duplicate bugs lp:1267268, lp:1315106, and lp:1327179
To post a comment you must log in.
Unmerged revisions
- 362. By Adam Israel
-
Add TODO section
- 361. By Adam Israel
-
Remove deprecated or broken commands
- 360. By Adam Israel
-
Update test to work on OS X, where /tmp is a symlink to /private/tmp
- 359. By Adam Israel
-
Print help info on use error
- 358. By Adam Israel
-
Fail fast if invalid template is specified
- 357. By Adam Israel
-
Add support for 'storage' meta key
- 356. By Adam Israel
-
Add a workaround for platforms (os x, windows, centos) where apt-get isn't available.
- 355. By Adam Israel
-
Fix lp:1305337 -- make `charm help test` and `charm-help test` work the same as `charm-test -h`
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
