Rebase on trunk

This commit is contained in:
James Page 2013-11-06 08:49:41 +08:00
commit 23493e534c
3 changed files with 592 additions and 669 deletions

@ -315,7 +315,7 @@ def quantum_joined(rid=None):
if ks_auth_config and ks_ca:
rel_settings['ca_cert'] = ks_ca
relation_set(rid=rid, **rel_settings)
relation_set(relation_id=rid, **rel_settings)
@hooks.hook('cluster-relation-changed',

1257
icon.svg

File diff suppressed because it is too large Load Diff

Before

(image error) Size: 42 KiB

After

(image error) Size: 36 KiB

@ -1 +1 @@
305
306