correct charm-helpers branch repository.

2014-10-27 10:20:30 +08:00
parent d5478c2493
commit 65408b3794
2 changed files with 2 additions and 4 deletions
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,5 +1,4 @@
-#branch: lp:charm-helpers
-branch: lp:~xianghui/charm-helpers/lp1385162
+branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
    - core
--- a/hooks/keystone_context.py
+++ b/hooks/keystone_context.py
@@ -13,8 +13,7 @@ from charmhelpers.contrib.hahelpers.cluster import (
 from charmhelpers.contrib.hahelpers.apache import install_ca_cert

 from charmhelpers.contrib.network.ip import (
-    get_address_in_network,
-    is_address_in_network)
+    get_address_in_network, is_address_in_network)

 import os