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

[Curtis Hovey]

Increment stable juju to 1.18.5

Update juju and win installer version to 1.18.5.

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

Increment stable juju to 1.18.5

Update juju and win installer version to 1.18.5.

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

[Curtis Hovey (sinzui)]

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"

[Horacio Durán (hduran-8)]

LGTM

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

=== 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:45:48 +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"
 
=== modified file 'version/version.go'
--- version/version.go	2014-05-09 16:23:42 +0000
+++ version/version.go	2014-06-03 15:45:48 +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.