Juju Charms Collection
node-app package

Merge lp://staging/~mariusko/charms/precise/node-app/lp1123939_procfile_support into lp://staging/charms/node-app

  1. Precise Pangolin (12.04)
  2. lp1123939_procfile_support
  3. Merge into trunk
Proposed by Marius B. Kotsbak
Status: Merged
Merged at revision: 32
Proposed branch: lp://staging/~mariusko/charms/precise/node-app/lp1123939_procfile_support
Merge into: lp://staging/charms/node-app
Diff against target: 154 lines (+82/-19)
4 files modified
README.markdown (+16/-1)
hooks/config-changed (+48/-0)
hooks/install (+6/-16)
hooks/mongodb-relation-changed (+12/-2)
To merge this branch: bzr merge lp://staging/~mariusko/charms/precise/node-app/lp1123939_procfile_support
Reviewer Review Type Date Requested Status
Juan L. Negron (community) Disapprove
Review via email: mp+149816@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~mariusko/charms/precise/node-app/lp1123939_procfile_support updated
33. By Marius B. Kotsbak

Updated documentation for Procfile and environment variables.

Revision history for this message
Juan L. Negron (negronjl) wrote :

Reviewing this now.

-Juan

Revision history for this message
Juan L. Negron (negronjl) wrote :

Hi Marius:

Charm proof tells me that the config-changed hook is not executable. Could you fix this please?

It's the only thing that I found preventing the merge. Ping me when you get this done and I'll re-check it. charm proof has to run without errors or warnings before I accept it.

-Juan

review: Disapprove
Revision history for this message
Marius B. Kotsbak (mariusko) wrote :

I guess you got it merged in that other branch? There where some problems with bzr and merging (add/add conflict).

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