Merge lp://qastaging/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates into lp://qastaging/orange-box

Proposed by Darryl Weaver
Status: Merged
Merged at revision: 489
Proposed branch: lp://qastaging/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates
Merge into: lp://qastaging/orange-box
Diff against target: 94 lines (+25/-11)
4 files modified
debian/postinst (+3/-2)
usr/bin/orange-box-demo-cleanup (+3/-2)
usr/bin/orange-box-sync-charmstore (+17/-5)
usr/lib/orange-box/patches/acquire_languages_none.patch (+2/-2)
To merge this branch: bzr merge lp://qastaging/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates
Reviewer Review Type Date Requested Status
Dustin Kirkland  Pending
Review via email: mp+236762@code.qastaging.launchpad.net

Description of the change

Fix for bug #1376279.
Fix for bug #1376292.
Renamed orange-box-destroy-juju to orange-box-demo-cleanup.
Provided a link for backwards compatibility.
Added /home/ubuntu/examples/bin/ to default PATH.

To post a comment you must log in.
Revision history for this message
Nicolas Thomas (thomnico) wrote :

Dweaver did you change the Example branch ??

shouldn't this:
   echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/examples/bin"
be:
 echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/Examples/bin"

On Wed, Oct 1, 2014 at 8:51 PM, <email address hidden> wrote:
> The proposal to merge lp:~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates into lp:orange-box has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
> https://code.launchpad.net/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates/+merge/236762
> --
> https://code.launchpad.net/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates/+merge/236762
> You are subscribed to branch lp:orange-box.

--
Best Regards,
       Nicolas Thomas
http://insights.ubuntu.com/?p=889
EMEA Solution Architect Canonical
GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9

Revision history for this message
Darryl Weaver (dweaver) wrote :

Ah, yes it should have been with a capital E for Examples.

Revision history for this message
Dustin Kirkland  (kirkland) wrote :

Fixed in r493.

Dustin Kirkland
Canonical, Ltd.

On Wed, Oct 1, 2014 at 7:09 PM, Darryl Weaver
<email address hidden> wrote:
> Ah, yes it should have been with a capital E for Examples.
> --
> https://code.launchpad.net/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates/+merge/236762
> You are requested to review the proposed merge of lp:~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates into lp:orange-box.

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