lp://staging/~mfoord/juju-core/ha-rsyslog-shortcut-removal

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2014-05-19

Diff: 62 lines (+0/-44)

2 files modified

worker/rsyslog/rsyslog_test.go (+0/-39)
worker/rsyslog/worker.go (+0/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2748. By Michael Foord on 2014-05-19

Remove obsolete test

2747. By Michael Foord on 2014-05-19

Remove obsolete check

2746. By Michael Foord on 2014-05-19

Merge from wwitzel3

2745. By Vladislav Klyachin on 2014-05-19

[r=klyachin],[bug=1309444] HA: peergrouper spins in local environment

The peergrouper is intended to monitor the MongoDB replica health and make sure everything is functioning well.
However, when run in the local provider, or in an upgraded environment (while we haven't finished all the upgrade steps), it spams the log file with:

INFO juju.worker runner.go:260 start "peergrouper"
ERROR juju.worker.peergrouper worker.go:137 peergrouper loop terminated: cannot get replica set status: cannot get replica set status: not running with --replSet

This fix ensure NOT running of peergrouper worker in local environment.

https://codereview.appspot.com/97880045/

R=axwalk, fwereade, jameinel, klyachin
R=axwalk, fwereade, jameinel, klyachin

2744. By Horacio Durán on 2014-05-19

[r=hduran-8] Added explicit --journal flag to mongod

Mongod has Write Ahead logging on by default for
64 bits systems:
http://docs.mongodb.org/manual/tutorial/manage-journaling/
juju seems to be assuming this for every arch
so the specific --journal flag was added.

https://codereview.appspot.com/97370044/

R=fwereade, hduran-8, wwitzel3

2743. By Dave Cheney on 2014-05-19

[r=fwereade],[bug=1320138] Fix LP 1320138

Constraints appear to be a set, not a list, so compare them in an unordered manner.

https://codereview.appspot.com/94520045/

2742. By Andrew Wilkins on 2014-05-19

[r=axwalk],[bug=1262967] Fix tests on i386

Various fixes to run tests on i386.

For Joyent, since it only supports
AMD64 I have modified the suites to
upload fake AMD64 tools; this involved
a change to envtesting.ToolsFixture
to parameterise UploadFakeTools.

For OpenStack, I added dummy metadata
for i386 and ppc64.

Fixes lp:1262967

https://codereview.appspot.com/92390046/

2741. By Andrew Wilkins on 2014-05-19

[r=axwalk] Fix arch preference algorithm

Change the instance architecture preference
selection to widest word-size, then first
arch name by alphabetical order. For tie-
breakers, choose the instance type based on
provider-specific ordering.

In the future we may want to extend the
ordering to include cost. For now, we rely
on the providers ordering instance types by
their own preference (no change here).

https://codereview.appspot.com/94530045/

2740. By Dave Cheney on 2014-05-18

[r=thumper] update errgo

Fixes gccgo incompatability

2739. By John A Meinel on 2014-05-16

[r=jameinel] utils/registry: TypedNameVersion registry

As part of getting API versioning in place, I was putting together some
Registry's in a couple of places. I realized I wanted 2 things that were
essentially identical code, just tracking slightly different object
types. So I put together an abstraction that still enforces the Type,
but is otherwise treats the input and output as a generic interface{}.

https://codereview.appspot.com/99180044/