Rebase on trunk

2013-10-25 14:26:47 -07:00 · 2013-10-25 14:26:47 -07:00 · 9168c0ffa5
commit 9168c0ffa5
parent 801ac9b82f a0e2deac21
3 changed files with 592 additions and 669 deletions
--- a/hooks/nova_cc_hooks.py
+++ b/hooks/nova_cc_hooks.py
@ -305,7 +305,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',
--- a/icon.svg
+++ b/icon.svg
--- a/2
+++ b/2
@ -1 +1 @@
-305
+306