lp:~menno.smits/juju-core/1194481-relation_name_in_status.0

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2014-05-18

Diff: 266 lines (+68/-18)

4 files modified

state/api/client.go (+8/-0)
state/apiserver/client/api_test.go (+26/-7)
state/apiserver/client/perm_test.go (+2/-2)
state/apiserver/client/status.go (+32/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2735. By Menno Finlay-Smits on 2014-05-26

Return relation map in status API response

This can be helpful for clients wishing to display the relation name
when, for example, relation hooks fail (coming soon).

2734. By Menno Finlay-Smits on 2014-05-22

Merged from trunk

2733. By Menno Finlay-Smits on 2014-05-16

Pass Machine and Unit StatusData through the client API

This is generally useful but is also specifically required to support
reporting of the affected relation when a hook fails.

The client API test scenario has been extended to include a case of a
unit with an error with status data included.

2732. By Ian Booth on 2014-05-15

[r=wallyworld],[bug=1318485] Use lxc clone by default

All providers now support configuring lxc
clone support, not just local provider. The
config attributes which previously were just
for local provider now are available on all
providers:
lxc-clone
lxc-clone-aufs

lxc-clone, if unspecified, will be set to
true if the underlying platform supports it.
The test is for Ubuntu trusty or greater. The
final check is done when the container manager
is created.

1.19.2 used a setting lxc-use-clone. This is now
removed in place of the universal lxc-clone setting.

https://codereview.appspot.com/94410043/

2731. By Tim Penhey on 2014-05-15

[r=thumper] Extract errors package to github.com/juju/errors

Also introduces a dependency on github.com/juju/errgo
and removes the github.com/errgo/errgo dependency.

Adds additional functions for simple tracing and
annotations of errors.

https://codereview.appspot.com/93410043/

2730. By Andrew Wilkins on 2014-05-14

[r=axwalk],[bug=1318527] testing: drop databases before each Mgo test

Previously the store package had its own mgo
suite, which was largely the same as the one
in juju-core/testing. It also had code to drop
the non-admin databases before each test case,
which I did not carry over when migrating. This
caused flakeyness.

Fixes lp:1318527

https://codereview.appspot.com/94460045/

2729. By Andrew Wilkins on 2014-05-14

[r=axwalk],[bug=1301467] testing: reattempt MgoInstance.run if addr in use

Mongod does not support listening on port 0 to
acquire an ephemeral port, so our tests must
choose a port which may then be allocated to
another process. This CL adds code to reattempt
the starting of mongod if the port is in use,
up to a maximum of 5 attempts.

https://codereview.appspot.com/94410046/

2728. By Andrew Wilkins on 2014-05-14

[r=axwalk],[bug=1260171],[bug=1316272] Change StopInstances to take []instance.Id

StopInstances previously took []instance.Instance,
which is unnecessary for most providers, and imposes
an unnecessary cost for callers that only have IDs
initially. We change StopInstances to

The openstack provider's StopInstances is now slightly
more expensive than before, requiring an additional call
to Instances. This cost will disappear when we fix the
security groups/open-port implementation.

Drive-by: the maas provider now uses a bulk "release"
in StopInstances.

Live tested on ec2, local, virtual MAAS, canonistack, azure.
I lack a Joyent account, but I think it should be fine.

Fixes lp:1260171
Fixes lp:1316272

https://codereview.appspot.com/97400043/

2727. By Ian Booth on 2014-05-13

[r=wallyworld] Merge latest 1.18 into trunk.

2726. By Michael Foord on 2014-05-13

[r=mfoord] utils:syslog: state servers broadcast logs

https://codereview.appspot.com/93270044/