Re: Do not land code on blocked branches

2015-05-04 Thread Richard Harding
Thanks for the update. I've closed the bug for now and we'll reopen an issue to update to the latest api version once that's changed. On Sun, 03 May 2015, John Meinel wrote: Just to follow up one small point, Rick. The reason Juju has to fix the API and restore the old behavior is because even

Re: Do not land code on blocked branches

2015-05-04 Thread John Meinel
So I believe you can already switch to how the Juju client does it today (call AddCharm before you call ServiceDeploy), just that we can't require you to do so. John =:- On Mon, May 4, 2015 at 7:56 PM, Richard Harding rick.hard...@canonical.com wrote: Thanks for the update. I've closed the bug

How good is a backup, without it ?

2015-05-04 Thread Louis Bouchard
Hello, This one kept me awake one night recently, but not being a juju developer, the only thing I can do is to throw the idea around. Maybe someone will catch it. Juju has a nice backup feature. But unless users run 'juju backup' store the output somewhere, it is useless. How difficult would

Re: Request to support to work with Juju

2015-05-04 Thread Katherine Cox-Buday
Thanks for reaching out, Dinesh! I have opened two bugs for these issues: 1.In *juju bootstrap. *It is *not downloading the disc image* itself. But when I check juju status, it is showing machine-0 (started state). https://bugs.launchpad.net/juju-core/+bug/1451487 2.And when I try to

Re: Request to support to work with Juju

2015-05-04 Thread John Meinel
On Mon, May 4, 2015 at 8:49 PM, Katherine Cox-Buday katherine.cox-bu...@canonical.com wrote: Thanks for reaching out, Dinesh! I have opened two bugs for these issues: 1.In *juju bootstrap. *It is *not downloading the disc image* itself. But when I check juju status, it is showing

bugs, fixes and targeting Juju versions

2015-05-04 Thread Jesse Meek
Hi All, tl;dr `git diff --no-prefix master diff.patch; patch -p0 diff.patch` is useful for landing bug fixes in different versions of juju. As a lot of us are currently bug hunting and needing to land fixes in multiple versions of Juju, I thought I'd share my process of doing that (maybe

Re: bugs, fixes and targeting Juju versions

2015-05-04 Thread Tim Penhey
git cherry-pick does this as a git command. Tim On 05/05/15 13:03, Jesse Meek wrote: Hi All, tl;dr `git diff --no-prefix master diff.patch; patch -p0 diff.patch` is useful for landing bug fixes in different versions of juju. As a lot of us are currently bug hunting and needing to land

Re: bugs, fixes and targeting Juju versions

2015-05-04 Thread Ian Booth
Yes, cheery pick is something I use all the time, as it fills out the PR in the latter branches with a nice commit message based on the original and also includes the original PR from which the commit was first done. On 05/05/15 11:45, Jesse Meek wrote: Ah, even better. Now I can update my

Re: Resolving the same windows test failures again

2015-05-04 Thread Andrew Wilkins
On Tue, May 5, 2015 at 7:20 AM, Martin Packman martin.pack...@canonical.com wrote: There was some confusion about the regression to the windows test failures on trunk. https://bugs.launchpad.net/juju-core/+bug/1450919 Partly my fault, Curtis initially looked at the 1.24 branch and I

Re: bugs, fixes and targeting Juju versions

2015-05-04 Thread Jesse Meek
Ah, even better. Now I can update my workflow :) On 05/05/15 13:43, Menno Smits wrote: cherry-pick will even grab the top commit of a branch if you give the branch name (presuming the fix is a single commit). For example: git checkout -b bug-fix-1.24 upstream/1.24 # create a branch for the

Re: Resolving the same windows test failures again

2015-05-04 Thread Nate Finch
Sorry for the lack of tests for that part of the code, I guess I added them for one and not the other. Note that I had actually been leaving that PR unmerged because I knew master was blocked. Sorry it got pushed in anyway, and caused problems. On Mon, May 4, 2015 at 7:20 PM, Martin Packman

Resolving the same windows test failures again

2015-05-04 Thread Martin Packman
There was some confusion about the regression to the windows test failures on trunk. https://bugs.launchpad.net/juju-core/+bug/1450919 Partly my fault, Curtis initially looked at the 1.24 branch and I looked at trunk, and each branch has a different issue. Here's what I've just done to diagnose.