juju-core

Merge lp:~sinzui/juju-core/inc-1.18.5 into lp:juju-core/1.18

  1. inc-1.18.5
  2. Merge into 1.18
Proposed by Curtis Hovey
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 2297
Proposed branch: lp:~sinzui/juju-core/inc-1.18.5
Merge into: lp:juju-core/1.18
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:~sinzui/juju-core/inc-1.18.5
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+221913@code.launchpad.net

Commit message

Increment stable juju to 1.18.5

Update juju and win installer version to 1.18.5.

https://codereview.appspot.com/93710043/

Description of the change

Increment stable juju to 1.18.5

Update juju and win installer version to 1.18.5.

https://codereview.appspot.com/93710043/

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

Reviewers: mp+221913_code.launchpad.net,

Message:
Please take a look.

Description:
Increment stable juju to 1.18.5

Update juju and win installer version to 1.18.5.

https://code.launchpad.net/~sinzui/juju-core/inc-1.18.5/+merge/221913

(do not edit description out of merge proposal)

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

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-20140602233541-pfsgm9wkjcsn74kj
+New revision: <email address hidden>

Index: version/version.go
=== modified file 'version/version.go'
--- version/version.go 2014-05-09 16:23:42 +0000
+++ version/version.go 2014-06-03 15:43:14 +0000
@@ -23,7 +23,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.18.4"
+const version = "1.18.5"

  // lsbReleaseFile is the name of the file that is read in order to
determine
  // the release version of ubuntu.

Index: scripts/win-installer/setup.iss
=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss 2014-05-09 16:23:42 +0000
+++ scripts/win-installer/setup.iss 2014-06-03 15:43:14 +0000
@@ -2,7 +2,7 @@
  ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

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

Revision history for this message
Horacio Durán (hduran-8) wrote :

LGTM

https://codereview.appspot.com/93710043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/win-installer/setup.iss'
2--- scripts/win-installer/setup.iss 2014-05-09 16:23:42 +0000
3+++ scripts/win-installer/setup.iss 2014-06-03 15:45:48 +0000
4@@ -2,7 +2,7 @@
5 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
6
7 #define MyAppName "Juju"
8-#define MyAppVersion "1.18.4"
9+#define MyAppVersion "1.18.5"
10 #define MyAppPublisher "Canonical, Ltd"
11 #define MyAppURL "http://juju.ubuntu.com/"
12 #define MyAppExeName "juju.exe"
13
14=== modified file 'version/version.go'
15--- version/version.go 2014-05-09 16:23:42 +0000
16+++ version/version.go 2014-06-03 15:45:48 +0000
17@@ -23,7 +23,7 @@
18 // The presence and format of this constant is very important.
19 // The debian/rules build recipe uses this value for the version
20 // number of the release package.
21-const version = "1.18.4"
22+const version = "1.18.5"
23
24 // lsbReleaseFile is the name of the file that is read in order to determine
25 // the release version of ubuntu.

Subscribers

People subscribed via source and target branches

to all changes: