Juju Charms Collection
apache2 package

Merge lp://staging/~bloodearnest/charms/precise/apache2/vhost-template-vars into lp://staging/charms/apache2

  1. Precise Pangolin (12.04)
  2. vhost-template-vars
  3. Merge into trunk
Proposed by Simon Davy
Status: Work in progress
Proposed branch: lp://staging/~bloodearnest/charms/precise/apache2/vhost-template-vars
Merge into: lp://staging/charms/apache2
Diff against target: 88 lines (+41/-0)
4 files modified
README.md (+5/-0)
config.yaml (+4/-0)
hooks/hooks.py (+4/-0)
hooks/tests/test_create_vhost.py (+28/-0)
To merge this branch: bzr merge lp://staging/~bloodearnest/charms/precise/apache2/vhost-template-vars
Reviewer Review Type Date Requested Status
Adam Israel (community) Needs Fixing
Review Queue (community) automated testing Needs Fixing
charmers Pending
Review via email: mp+251268@code.staging.launchpad.net

Commit message

Add vhost_template_vars, as per trusty branch

Description of the change

Add vhost_template_vars, as per trusty branch

To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote :

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11066-results

review: Needs Fixing (automated testing)
Reply
Revision history for this message
Review Queue (review-queue) wrote :

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11076-results

review: Needs Fixing (automated testing)
Reply
Revision history for this message
Adam Israel (aisrael) wrote :

Hi Simon,

Thanks for your work on improving the apache2 charm. It appears that the test_create_vhost_template_config test has been duplicated, which is causing a lint error. The other automated test failures, relating to self-signed certificates, is a problem upstream and won't stand in the way of this merge, once the lint error is corrected.

review: Approve
Reply
Revision history for this message
Adam Israel (aisrael) wrote :

Sorry, I meant to mark as needs fixing.

review: Needs Fixing
Reply
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

I've moved this to Work In Progress, when ready for another review please move to Needs Review

Reply

Unmerged revisions

62. By Simon Davy

add vhost_template_vars, merge from trusty

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

to all changes: