Merge lp:~dave-cheney/juju-core/167-simplestreams-add-trusty into lp:~go-bot/juju-core/trunk
Proposed by
Dave Cheney
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Martin Packman | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2321 | ||||
Proposed branch: | lp:~dave-cheney/juju-core/167-simplestreams-add-trusty | ||||
Merge into: | lp:~go-bot/juju-core/trunk | ||||
Diff against target: |
47 lines (+7/-4) 3 files modified
environs/simplestreams/simplestreams.go (+2/-2) environs/simplestreams/simplestreams_test.go (+2/-2) testing/constants.go (+3/-0) |
||||
To merge this branch: | bzr merge lp:~dave-cheney/juju-core/167-simplestreams-add-trusty | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+205684@code.launchpad.net |
Commit message
simplestreams: add trusty
Lost in the various commit messages was a desire to consolidate the list of
supported series. This proposal is the first of several.
Description of the change
simplestreams: add trusty
To post a comment you must log in.
Reviewers: mp+205684_ code.launchpad. net,
Message:
Please take a look.
Description:
simplestreams: add trusty
https:/ /code.launchpad .net/~dave- cheney/ juju-core/ 167-simplestrea ms-add- trusty/ +merge/ 205684
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/61560045/
Affected files (+9, -4 lines): simplestreams/ simplestreams. go simplestreams/ simplestreams_ test.go constants. go
A [revision details]
M environs/
M environs/
M testing/
Index: [revision details] 20140210142230- bs4gcvlb7cjb3ti g
=== 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: testing/ constants. go constants. go' constants. go 2013-07-30 16:36:03 +0000 constants. go 2014-02-11 03:40:13 +0000
=== modified file 'testing/
--- testing/
+++ testing/
@@ -25,3 +25,6 @@
Total: LongWait,
Delay: ShortWait,
}
+
+// SupportedSeries lists the series known to Juju.
+var SupportedSeries =
[]string{"precise", "quantal", "raring", "saucy", "trusty"}
Index: environs/ simplestreams/ simplestreams. go simplestreams/ simplestreams. go' simplestreams/ simplestreams. go 2014-01-29 09:58:08 +0000 simplestreams/ simplestreams. go 2014-02-11 03:40:13 +0000 nsMutex. Lock() utex.Unlock( ) Versions( )
=== modified file 'environs/
--- environs/
+++ environs/
@@ -127,8 +127,8 @@
seriesVersio
defer seriesVersionsM
updateSeries
- series := []string{}
- for s, _ := range seriesVersions {
+ var series []string
+ for s := range seriesVersions {
series = append(series, s)
}
return series
Index: environs/ simplestreams/ simplestreams_ test.go simplestreams/ simplestreams_ test.go' simplestreams/ simplestreams_ test.go 2013-11-26 12:24:48 +0000 simplestreams/ simplestreams_ test.go 2014-02-11 03:40:13 +0000
=== modified file 'environs/
--- environs/
+++ environs/
@@ -13,6 +13,7 @@
"launchpad. net/juju- core/environs/ simplestreams" net/juju- core/environs/ simplestreams/ testing" net/juju- core/testing" net/juju- core/testing/ checkers"
sstesting "launchpad.
+ coretesting "launchpad.
jc "launchpad.
)
@@ -411,8 +412,7 @@ SupportedSeries () Strings( series) SupportedSeries )
defer cleanup()
series := simplestreams.
sort.
- series = series[0:4]
- c.Assert(series, gc.DeepEquals,
[]string{"precise", "quantal", "raring", "saucy"})
+ c.Assert(series, gc.DeepEquals, coretesting.
}
var getMirrorTests = []struct {