Fake Juju

Merge lp:~simpoir/fake-juju/juju2.0beta10_bump into lp:~landscape/fake-juju/trunk-old

  1. juju2.0beta10_bump
  2. Merge into trunk-old
Proposed by Simon Poirier
Status: Merged
Approved by: Simon Poirier
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~simpoir/fake-juju/juju2.0beta10_bump
Merge into: lp:~landscape/fake-juju/trunk-old
Diff against target: 48 lines (+9/-9)
2 files modified
Makefile (+1/-1)
patches/juju-core_2.0-beta10.patch (+8/-8)
To merge this branch: bzr merge lp:~simpoir/fake-juju/juju2.0beta10_bump
Reviewer Review Type Date Requested Status
Chad Smith Approve
Alberto Donato (community) Approve
Landscape Pending
Review via email: mp+298657@code.launchpad.net

Commit message

trivial bump to juju2.0 beta 10

Description of the change

trivial bump to juju2.0 beta 10

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Voting does not meet specified criteria. Required: Approve >= 2, Disapprove == 0. Got: 1 Approve.

Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

No approved revision specified.

Revision history for this message
Chad Smith (chad.smith) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed directory '2.0-beta9' => '2.0-beta10'
2=== modified file 'Makefile'
3--- Makefile 2016-06-23 20:27:10 +0000
4+++ Makefile 2016-06-29 14:46:22 +0000
5@@ -1,5 +1,5 @@
6 JUJU1_VERSIONS = 1.24.7 1.25.3
7-JUJU2_VERSIONS = 2.0-beta9
8+JUJU2_VERSIONS = 2.0-beta10
9 VERSIONS = $(JUJU1_VERSIONS) $(JUJU2_VERSIONS)
10 GO_VERSION = 1.6
11 TARBALLS = $(foreach version,$(VERSIONS),juju-core_$(version).tar.gz)
12
13=== renamed file 'patches/juju-core_2.0-beta9.patch' => 'patches/juju-core_2.0-beta10.patch'
14--- patches/juju-core_2.0-beta9.patch 2016-06-20 19:46:35 +0000
15+++ patches/juju-core_2.0-beta10.patch 2016-06-29 14:46:22 +0000
16@@ -1,6 +1,6 @@
17---- 2.0-beta9/src/github.com/juju/juju/testcharms/charm.go 2016-03-10 13:45:57.000000000 +0100
18-+++ 2.0-beta9/src/github.com/juju/juju/testcharms/charm.go 2016-03-21 10:46:24.312966629 +0100
19-@@ -15,7 +15,9 @@
20+--- 2.0-beta10/src/github.com/juju/juju/testcharms/charm.go 2016-03-10 13:45:57.000000000 +0100
21++++ 2.0-beta10/src/github.com/juju/juju/testcharms/charm.go 2016-03-21 10:46:24.312966629 +0100
22+@@ -17,7 +17,9 @@
23 )
24
25 // Repo provides access to the test charm repository.
26@@ -11,9 +11,9 @@
27
28 // UploadCharm uploads a charm using the given charm store client, and returns
29 // the resulting charm URL and charm.
30---- 2.0-beta9/src/github.com/juju/juju/provider/dummy/environs.go 2015-07-06 15:01:14.200568258 +0200
31-+++ 2.0-beta9/src/github.com/juju/juju/provider/dummy/environs.go 2015-07-06 15:18:32.648549661 +0200
32-@@ -690,9 +690,9 @@
33+--- 2.0-beta10/src/github.com/juju/juju/provider/dummy/environs.go 2015-07-06 15:01:14.200568258 +0200
34++++ 2.0-beta10/src/github.com/juju/juju/provider/dummy/environs.go 2015-07-06 15:18:32.648549661 +0200
35+@@ -633,9 +633,9 @@
36
37 // PrecheckInstance is specified in the state.Prechecker interface.
38 func (*environ) PrecheckInstance(series string, cons constraints.Value, placement string) error {
39@@ -26,8 +26,8 @@
40 return nil
41 }
42
43---- 2.0-beta9/src/github.com/juju/juju/testing/cert.go 2016-03-18 09:25:34 +0000
44-+++ 2.0-beta9/src/github.com/juju/juju/testing/cert.go 2016-03-18 09:26:04 +0000
45+--- 2.0-beta10/src/github.com/juju/juju/testing/cert.go 2016-03-18 09:25:34 +0000
46++++ 2.0-beta10/src/github.com/juju/juju/testing/cert.go 2016-03-18 09:26:04 +0000
47 @@ -52,7 +52,7 @@
48 }
49

Subscribers

People subscribed via source and target branches

to all changes: