Merge lp:~sinzui/juju-core/inc-1.16.6 into lp:juju-core/1.16
Proposed by
Curtis Hovey
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2000 |
Proposed branch: | lp:~sinzui/juju-core/inc-1.16.6 |
Merge into: | lp:juju-core/1.16 |
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.16.6 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+198636@code.launchpad.net |
Commit message
Increment juju-core stable to 1.16.6
I don't think we will do a 1.16.6, but just in case.
Description of the change
Increment juju-core stable to 1.16.6
I don't think we will do a 1.16.6, but just in case.
To post a comment you must log in.
Reviewers: mp+198636_ code.launchpad. net,
Message:
Please take a look.
Description:
Increment juju-core stable to 1.16.6
I don't think we will do a 1.16.6, but just in case.
https:/ /code.launchpad .net/~sinzui/ juju-core/ inc-1.16. 6/+merge/ 198636
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/41030044/
Affected files (+4, -2 lines): win-installer/ setup.iss
A [revision details]
M scripts/
M version/version.go
Index: [revision details] 20131210125411- zeiii0j28p6lje1 s
=== 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-
+New revision: <email address hidden>
Index: version/version.go version. go'
=== modified file 'version/
--- version/version.go 2013-11-27 13:50:29 +0000
+++ version/version.go 2013-12-11 16:21:40 +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.16.5"
+const version = "1.16.6"
// 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 win-installer/ setup.iss' win-installer/ setup.iss 2013-11-27 13:50:29 +0000 win-installer/ setup.iss 2013-12-11 16:21:40 +0000
=== modified file 'scripts/
--- scripts/
+++ scripts/
@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Juju" juju.ubuntu. com/"
-#define MyAppVersion "1.16.5"
+#define MyAppVersion "1.16.6"
#define MyAppPublisher "Canonical, Ltd"
#define MyAppURL "http://
#define MyAppExeName "juju.exe"