Merge lp://staging/~freyes/openstack-charm-testing/fix-tools into lp://staging/openstack-charm-testing

Proposed by Felipe Reyes
Status: Rejected
Rejected by: Ryan Beisner
Proposed branch: lp://staging/~freyes/openstack-charm-testing/fix-tools
Merge into: lp://staging/openstack-charm-testing
Diff against target: 41 lines (+9/-5)
3 files modified
tools/quota_high.sh (+4/-2)
tools/quota_million.sh (+4/-2)
tools/sec_groups.sh (+1/-1)
To merge this branch: bzr merge lp://staging/~freyes/openstack-charm-testing/fix-tools
Reviewer Review Type Date Requested Status
Ryan Beisner Needs Information
Review via email: mp+303704@code.staging.launchpad.net

Description of the change

  Make tools/*.sh compatible with juju 1.x/2.x

  Scripts modified:
    tools/quota_high.sh
    tools/quota_million.sh
    tools/sec_groups.sh

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Thank you for your work here. However, I believe the LP bug was addressed separately and already committed. In order to consider this merge proposal, it will need to be rebased with lp:openstack-charm-testing trunk.

review: Needs Information
239. By Felipe Reyes

Merge from trunk

240. By Felipe Reyes

Use "juju set || juju config" approach

241. By Felipe Reyes

Remove blank lines, restore info message

Revision history for this message
Felipe Reyes (freyes) wrote :

Ryan, I just rebased this patch, and part of it still is needed in trunk. tools/quota_{high,million}.sh need to be updated to work with juju 2.x

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Apologies for the overlap and delay. Thanks for your work here; these items were fixed in trunk in a separate MP.

Unmerged revisions

241. By Felipe Reyes

Remove blank lines, restore info message

240. By Felipe Reyes

Use "juju set || juju config" approach

239. By Felipe Reyes

Merge from trunk

238. By Felipe Reyes

Make tools/*.sh compatible with juju 1.x/2.x

Scripts modified:
  tools/quota_high.sh
  tools/quota_million.sh
  tools/sec_groups.sh

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 status/vote changes: