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
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.

https://codereview.appspot.com/41030044/

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.

https://codereview.appspot.com/41030044/

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

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):
   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-20131210125411-zeiii0j28p6lje1s
+New revision: <email address hidden>

Index: version/version.go
=== modified file 'version/version.go'
--- 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
=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss 2013-11-27 13:50:29 +0000
+++ scripts/win-installer/setup.iss 2013-12-11 16:21:40 +0000
@@ -2,7 +2,7 @@
  ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

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

Revision history for this message
Nate Finch (natefinch) wrote :
Revision history for this message
Dave Cheney (dave-cheney) wrote :

LGTM.

On Thu, Dec 12, 2013 at 6:57 AM, Curtis Hovey <email address hidden> wrote:

> 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):
> 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-20131210125411-zeiii0j28p6lje1s
> +New revision: <email address hidden>
>
> Index: version/version.go
> === modified file 'version/version.go'
> --- 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
> === modified file 'scripts/win-installer/setup.iss'
> --- scripts/win-installer/setup.iss 2013-11-27 13:50:29 +0000
> +++ scripts/win-installer/setup.iss 2013-12-11 16:21:40 +0000
> @@ -2,7 +2,7 @@
> ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
>
> #define MyAppName "Juju"
> -#define MyAppVersion "1.16.5"
> +#define MyAppVersion "1.16.6"
> #define MyAppPublisher "Canonical, Ltd"
> #define MyAppURL "http://juju.ubuntu.com/"
> #define MyAppExeName "juju.exe"
>
>
>
>
>
> --
> https://code.launchpad.net/~sinzui/juju-core/inc-1.16.6/+merge/198636
> Your team juju hackers is requested to review the proposed merge of
> lp:~sinzui/juju-core/inc-1.16.6 into lp:juju-core/1.16.
>

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (22.2 KiB)

The attempt to merge lp:~sinzui/juju-core/inc-1.16.6 into lp:juju-core/1.16 failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.330s
ok launchpad.net/juju-core/agent/tools 0.225s
ok launchpad.net/juju-core/bzr 8.274s
ok launchpad.net/juju-core/cert 3.111s
ok launchpad.net/juju-core/charm 0.548s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.027s
ok launchpad.net/juju-core/cmd 0.219s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 188.083s
ok launchpad.net/juju-core/cmd/jujud 50.673s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 2.410s
? launchpad.net/juju-core/cmd/plugins/juju-update-bootstrap [no test files]
ok launchpad.net/juju-core/constraints 0.042s
ok launchpad.net/juju-core/container/lxc 0.311s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.274s
ok launchpad.net/juju-core/environs 3.243s
ok launchpad.net/juju-core/environs/bootstrap 5.239s
ok launchpad.net/juju-core/environs/cloudinit 0.522s
ok launchpad.net/juju-core/environs/config 0.791s
ok launchpad.net/juju-core/environs/configstore 0.068s
ok launchpad.net/juju-core/environs/filestorage 0.035s
ok launchpad.net/juju-core/environs/httpstorage 0.942s
ok launchpad.net/juju-core/environs/imagemetadata 0.487s
ok launchpad.net/juju-core/environs/instances 0.053s
ok launchpad.net/juju-core/environs/jujutest 0.208s
ok launchpad.net/juju-core/environs/manual 4.714s
ok launchpad.net/juju-core/environs/simplestreams 0.339s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.143s
ok launchpad.net/juju-core/environs/storage 1.178s
ok launchpad.net/juju-core/environs/sync 29.240s
ok launchpad.net/juju-core/environs/testing 0.227s
ok launchpad.net/juju-core/environs/tools 6.993s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.016s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 18.394s
ok launchpad.net/juju-core/juju/osenv 0.018s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.015s
ok launchpad.net/juju-core/log/syslog 0.021s
ok launchpad.net/juju-core/names 0.025s
? launchpad.net/juju-core/provider [no test files]
? launchpad.net/juju-core/provider/all [no test files]
ok launchpad.net/juju-core/provider/azure 6.585s
ok launchpad.net/juju-core/provider/common 0.299s
ok launchpad.net/juju-core/provider/dummy 21.675s
ok launchpad.net/juju-core/provider/ec2 5.666s
ok launchpad.net/juju-core/provider/ec2/httpstorage 0.189s
ok launchpad.net/juju-core/provider/local 2.239s
ok launchpad.net/juju-core/provider/maas 11.452s
ok launchpad.net/juju-core/provider/null 1.196s
ok launchpad.net/juju-core/provider/openstack 13.890s
ok launchpad.net/juju-core/rpc 0.082s
ok launchpad.net/juju-core/rpc/jsoncode...

Revision history for this message
John A Meinel (jameinel) wrote :

looks spurious

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 2013-11-27 13:50:29 +0000
3+++ scripts/win-installer/setup.iss 2013-12-11 19:48:41 +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.16.5"
9+#define MyAppVersion "1.16.6"
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 2013-11-27 13:50:29 +0000
16+++ version/version.go 2013-12-11 19:48:41 +0000
17@@ -22,7 +22,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.16.5"
22+const version = "1.16.6"
23
24 // Current gives the current version of the system. If the file
25 // "FORCE-VERSION" is present in the same directory as the running

Subscribers

People subscribed via source and target branches

to all changes: