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

[Simon Poirier]

trivial bump to juju2.0 beta 10

trivial bump to juju2.0 beta 10

[Alberto Donato (ack)]

+1

review: Approve

[🤖 Landscape Builder (landscape-builder)]

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

[🤖 Landscape Builder (landscape-builder)]

No approved revision specified.

[Chad Smith (chad.smith)]

+1

review: Approve

=== renamed directory '2.0-beta9' => '2.0-beta10'
=== modified file 'Makefile'
--- Makefile	2016-06-23 20:27:10 +0000
+++ Makefile	2016-06-29 14:46:22 +0000
@@ -1,5 +1,5 @@
 JUJU1_VERSIONS = 1.24.7 1.25.3
-JUJU2_VERSIONS = 2.0-beta9
+JUJU2_VERSIONS = 2.0-beta10
 VERSIONS = $(JUJU1_VERSIONS) $(JUJU2_VERSIONS)
 GO_VERSION = 1.6
 TARBALLS = $(foreach version,$(VERSIONS),juju-core_$(version).tar.gz)
 
=== renamed file 'patches/juju-core_2.0-beta9.patch' => 'patches/juju-core_2.0-beta10.patch'
--- patches/juju-core_2.0-beta9.patch	2016-06-20 19:46:35 +0000
+++ patches/juju-core_2.0-beta10.patch	2016-06-29 14:46:22 +0000
@@ -1,6 +1,6 @@
---- 2.0-beta9/src/github.com/juju/juju/testcharms/charm.go	2016-03-10 13:45:57.000000000 +0100
-+++ 2.0-beta9/src/github.com/juju/juju/testcharms/charm.go	2016-03-21 10:46:24.312966629 +0100
-@@ -15,7 +15,9 @@
+--- 2.0-beta10/src/github.com/juju/juju/testcharms/charm.go	2016-03-10 13:45:57.000000000 +0100
++++ 2.0-beta10/src/github.com/juju/juju/testcharms/charm.go	2016-03-21 10:46:24.312966629 +0100
+@@ -17,7 +17,9 @@
  )
  
  // Repo provides access to the test charm repository.
@@ -11,9 +11,9 @@
  
  // UploadCharm uploads a charm using the given charm store client, and returns
  // the resulting charm URL and charm.
---- 2.0-beta9/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:01:14.200568258 +0200
-+++ 2.0-beta9/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:18:32.648549661 +0200
-@@ -690,9 +690,9 @@
+--- 2.0-beta10/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:01:14.200568258 +0200
++++ 2.0-beta10/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:18:32.648549661 +0200
+@@ -633,9 +633,9 @@
  
  // PrecheckInstance is specified in the state.Prechecker interface.
  func (*environ) PrecheckInstance(series string, cons constraints.Value, placement string) error {
@@ -26,8 +26,8 @@
  	return nil
  }
  
---- 2.0-beta9/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:25:34 +0000
-+++ 2.0-beta9/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:26:04 +0000
+--- 2.0-beta10/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:25:34 +0000
++++ 2.0-beta10/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:26:04 +0000
 @@ -52,7 +52,7 @@
  }