Merge lp://staging/~sinzui/juju-core/inc-1.19.4 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: 2820
Proposed branch: lp://staging/~sinzui/juju-core/inc-1.19.4
Merge into: lp://staging/~go-bot/juju-core/trunk
Diff against target: 29 lines (+3/-3)
2 files modified
scripts/win-installer/setup.iss (+1/-1)
version/version.go (+2/-2)
To merge this branch: bzr merge lp://staging/~sinzui/juju-core/inc-1.19.4
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+221570@code.staging.launchpad.net

Commit message

Increment juju devel to 1.19.4.

Increment juju devel version and win installer to 1.19.4.

https://codereview.appspot.com/100880046/

Description of the change

Increment juju devel to 1.19.4.

Increment juju devel version and win installer to 1.19.4.

https://codereview.appspot.com/100880046/

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

Reviewers: mp+221570_code.launchpad.net,

Message:
Please take a look.

Description:
Increment juju devel to 1.19.4.

Increment juju devel version and win installer to 1.19.4.

https://code.launchpad.net/~sinzui/juju-core/inc-1.19.4/+merge/221570

(do not edit description out of merge proposal)

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

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-20140530163551-b1m9k0br0iaxwqim
+New revision: <email address hidden>

Index: version/version.go
=== modified file 'version/version.go'
--- version/version.go 2014-05-28 04:32:02 +0000
+++ version/version.go 2014-05-30 17:17:02 +0000
@@ -24,7 +24,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.19.3"
+const version = "1.19.4"

  // The version that we switched over from old style numbering to new style.
  var switchOverVersion = MustParse("1.19.3")

Index: scripts/win-installer/setup.iss
=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss 2014-05-28 04:32:02 +0000
+++ scripts/win-installer/setup.iss 2014-05-30 17:17:02 +0000
@@ -2,7 +2,7 @@
  ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

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

Revision history for this message
Michael Foord (mfoord) wrote :

On 2014/05/30 17:23:07, curtis wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/100880046/

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

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

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 0.909s
ok launchpad.net/juju-core/agent/mongo 0.480s
ok launchpad.net/juju-core/agent/tools 0.208s
ok launchpad.net/juju-core/audit 0.012s
ok launchpad.net/juju-core/bzr 5.046s
ok launchpad.net/juju-core/cert 2.235s
ok launchpad.net/juju-core/charm 0.427s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.157s
ok launchpad.net/juju-core/cloudinit/sshinit 0.699s
ok launchpad.net/juju-core/cmd 0.153s
ok launchpad.net/juju-core/cmd/charm-admin 0.246s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.190s

----------------------------------------------------------------------
FAIL: bootstrap_test.go:505: BootstrapSuite.TestValidateConstraintsCalledWithMetadatasource

[LOG] 0:00.004 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.004 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.004 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson": stat /tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.004 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson" not found
[LOG] 0:00.004 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.json": stat /tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.json: no such file or directory
[LOG] 0:00.004 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.json": invalid URL "file:///tmp/jctest.CJn/gocheck-2775422040480279449/50/tools/streams/v1/index.json" not found
[LOG] 0:00.006 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.006 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.006 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.CJn/gocheck-2775422040480279449/51/images/streams/v1/index.sjson": stat /tmp/jctest.CJn/gocheck-2775422040480279449/51/images/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.006 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.CJn/gocheck-2775422040480279449/51/images/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.CJn/gocheck-2775422040480279449/51/images/streams/v1/index.sjson" not found
[LOG] 0:00.006 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.CJn/gocheck-2775422040480279449/51/images/streams/v1/index.json"...

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

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

ok launchpad.net/juju-core 0.012s
ok launchpad.net/juju-core/agent 0.901s
ok launchpad.net/juju-core/agent/mongo 0.445s
ok launchpad.net/juju-core/agent/tools 0.162s
ok launchpad.net/juju-core/audit 0.013s
ok launchpad.net/juju-core/bzr 4.901s
ok launchpad.net/juju-core/cert 2.739s
ok launchpad.net/juju-core/charm 0.428s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.149s
ok launchpad.net/juju-core/cloudinit/sshinit 0.794s
ok launchpad.net/juju-core/cmd 0.157s
ok launchpad.net/juju-core/cmd/charm-admin 0.276s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.200s

----------------------------------------------------------------------
FAIL: bootstrap_test.go:505: BootstrapSuite.TestValidateConstraintsCalledWithMetadatasource

[LOG] 0:00.005 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.005 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.005 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.sjson": stat /tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.005 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.sjson" not found
[LOG] 0:00.005 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.json": stat /tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.json: no such file or directory
[LOG] 0:00.005 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.json": invalid URL "file:///tmp/jctest.M4X/gocheck-4751997750760398084/50/tools/streams/v1/index.json" not found
[LOG] 0:00.007 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.007 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.007 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.M4X/gocheck-4751997750760398084/51/images/streams/v1/index.sjson": stat /tmp/jctest.M4X/gocheck-4751997750760398084/51/images/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.007 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.M4X/gocheck-4751997750760398084/51/images/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.M4X/gocheck-4751997750760398084/51/images/streams/v1/index.sjson" not found
[LOG] 0:00.008 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.M4X/gocheck-4751997750760398084/51/images/streams/v1/index.json"...

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

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

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 0.895s
ok launchpad.net/juju-core/agent/mongo 0.451s
ok launchpad.net/juju-core/agent/tools 0.212s
ok launchpad.net/juju-core/audit 0.013s
ok launchpad.net/juju-core/bzr 5.161s
ok launchpad.net/juju-core/cert 3.428s
ok launchpad.net/juju-core/charm 0.436s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.166s
ok launchpad.net/juju-core/cloudinit/sshinit 0.743s
ok launchpad.net/juju-core/cmd 0.161s
ok launchpad.net/juju-core/cmd/charm-admin 0.285s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.183s

----------------------------------------------------------------------
FAIL: bootstrap_test.go:505: BootstrapSuite.TestValidateConstraintsCalledWithMetadatasource

[LOG] 0:00.007 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.007 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.008 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson": stat /tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.008 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson" not found
[LOG] 0:00.008 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.json": stat /tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.json: no such file or directory
[LOG] 0:00.008 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.json": invalid URL "file:///tmp/jctest.mRW/gocheck-2775422040480279449/50/tools/streams/v1/index.json" not found
[LOG] 0:00.010 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.010 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.011 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.mRW/gocheck-2775422040480279449/51/images/streams/v1/index.sjson": stat /tmp/jctest.mRW/gocheck-2775422040480279449/51/images/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.011 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.mRW/gocheck-2775422040480279449/51/images/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.mRW/gocheck-2775422040480279449/51/images/streams/v1/index.sjson" not found
[LOG] 0:00.011 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.mRW/gocheck-2775422040480279449/51/images/streams/v1/index.json"...

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

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

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 0.876s
ok launchpad.net/juju-core/agent/mongo 0.548s
ok launchpad.net/juju-core/agent/tools 0.207s
ok launchpad.net/juju-core/audit 0.013s
ok launchpad.net/juju-core/bzr 5.107s
ok launchpad.net/juju-core/cert 2.510s
ok launchpad.net/juju-core/charm 0.445s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.171s
ok launchpad.net/juju-core/cloudinit/sshinit 0.681s
ok launchpad.net/juju-core/cmd 0.187s
ok launchpad.net/juju-core/cmd/charm-admin 0.272s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.206s

----------------------------------------------------------------------
FAIL: bootstrap_test.go:505: BootstrapSuite.TestValidateConstraintsCalledWithMetadatasource

[LOG] 0:00.006 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.006 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.006 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson": stat /tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.006 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.sjson" not found
[LOG] 0:00.007 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.json": stat /tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.json: no such file or directory
[LOG] 0:00.007 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.json": invalid URL "file:///tmp/jctest.g7M/gocheck-2775422040480279449/50/tools/streams/v1/index.json" not found
[LOG] 0:00.009 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.009 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.010 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.g7M/gocheck-2775422040480279449/51/images/streams/v1/index.sjson": stat /tmp/jctest.g7M/gocheck-2775422040480279449/51/images/streams/v1/index.sjson: no such file or directory
[LOG] 0:00.010 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/jctest.g7M/gocheck-2775422040480279449/51/images/streams/v1/index.sjson": invalid URL "file:///tmp/jctest.g7M/gocheck-2775422040480279449/51/images/streams/v1/index.sjson" not found
[LOG] 0:00.010 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/jctest.g7M/gocheck-2775422040480279449/51/images/streams/v1/index.json"...

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: