Merge lp://staging/~sinzui/juju-core/inc-1.17.3 into lp://staging/~go-bot/juju-core/trunk

Proposed by Curtis Hovey
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 2288
Proposed branch: lp://staging/~sinzui/juju-core/inc-1.17.3
Merge into: lp://staging/~go-bot/juju-core/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
scripts/win-installer/setup.iss (+1/-1)
version/version.go (+1/-1)
To merge this branch: bzr merge lp://staging/~sinzui/juju-core/inc-1.17.3
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+204268@code.staging.launchpad.net

Commit message

Increment juju to 1.17.3.

Description of the change

Increment juju to 1.17.3.

Juju 1.17.2 is released.

https://codereview.appspot.com/59050044/

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Reviewers: mp+204268_code.launchpad.net,

Message:
Please take a look.

Description:
Increment juju to 1.17.3.

Juju 1.17.2 is released.

https://code.launchpad.net/~sinzui/juju-core/inc-1.17.3/+merge/204268

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/59050044/

Affected files (+4, -2 lines):
   A [revision details]
   M scripts/win-installer/setup.iss
   M version/version.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140131142010-4qv52gp4nvzv5e3b
+New revision: <email address hidden>

Index: version/version.go
=== modified file 'version/version.go'
--- version/version.go 2014-01-28 15:24:56 +0000
+++ version/version.go 2014-01-31 15:41:48 +0000
@@ -22,7 +22,7 @@
  // The presence and format of this constant is very important.
  // The debian/rules build recipe uses this value for the version
  // number of the release package.
-const version = "1.17.2"
+const version = "1.17.3"

  // Current gives the current version of the system. If the file
  // "FORCE-VERSION" is present in the same directory as the running

Index: scripts/win-installer/setup.iss
=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss 2014-01-28 15:24:56 +0000
+++ scripts/win-installer/setup.iss 2014-01-31 15:41:48 +0000
@@ -2,7 +2,7 @@
  ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

  #define MyAppName "Juju"
-#define MyAppVersion "1.17.2"
+#define MyAppVersion "1.17.3"
  #define MyAppPublisher "Canonical, Ltd"
  #define MyAppURL "http://juju.ubuntu.com/"
  #define MyAppExeName "juju.exe"

Revision history for this message
Roger Peppe (rogpeppe) wrote :

On 2014/01/31 15:45:33, curtis wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/59050044/

Revision history for this message
William Reade (fwereade) wrote :

LGTM

On Fri, Jan 31, 2014 at 4:45 PM, Curtis Hovey <email address hidden> wrote:

> Curtis Hovey has proposed merging lp:~sinzui/juju-core/inc-1.17.3 into
> lp:juju-core.
>
> Requested reviews:
> juju hackers (juju)
>
> For more details, see:
> https://code.launchpad.net/~sinzui/juju-core/inc-1.17.3/+merge/204268
>
> Increment juju to 1.17.3.
>
> Juju 1.17.2 is released.
>
> https://codereview.appspot.com/59050044/
>
> --
> https://code.launchpad.net/~sinzui/juju-core/inc-1.17.3/+merge/204268
> Your team juju hackers is requested to review the proposed merge of
> lp:~sinzui/juju-core/inc-1.17.3 into lp:juju-core.
>
> === modified file 'scripts/win-installer/setup.iss'
> --- scripts/win-installer/setup.iss 2014-01-28 15:24:56 +0000
> +++ scripts/win-installer/setup.iss 2014-01-31 15:44:17 +0000
> @@ -2,7 +2,7 @@
> ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
>
> #define MyAppName "Juju"
> -#define MyAppVersion "1.17.2"
> +#define MyAppVersion "1.17.3"
> #define MyAppPublisher "Canonical, Ltd"
> #define MyAppURL "http://juju.ubuntu.com/"
> #define MyAppExeName "juju.exe"
>
> === modified file 'version/version.go'
> --- version/version.go 2014-01-28 15:24:56 +0000
> +++ version/version.go 2014-01-31 15:44:17 +0000
> @@ -22,7 +22,7 @@
> // The presence and format of this constant is very important.
> // The debian/rules build recipe uses this value for the version
> // number of the release package.
> -const version = "1.17.2"
> +const version = "1.17.3"
>
> // Current gives the current version of the system. If the file
> // "FORCE-VERSION" is present in the same directory as the running
>
>
>

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: