bigdata-dev team mailing list archive
-
bigdata-dev team
-
Mailing list archive
-
Message #00097
[Merge] lp:~johnsca/charms/trusty/apache-hadoop-hdfs-secondary/etc-hosts-refactor into lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk
Cory Johns has proposed merging lp:~johnsca/charms/trusty/apache-hadoop-hdfs-secondary/etc-hosts-refactor into lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk.
Requested reviews:
Juju Big Data Development (bigdata-dev)
For more details, see:
https://code.launchpad.net/~johnsca/charms/trusty/apache-hadoop-hdfs-secondary/etc-hosts-refactor/+merge/262464
Use refactored /etc/hosts management
--
Your team Juju Big Data Development is requested to review the proposed merge of lp:~johnsca/charms/trusty/apache-hadoop-hdfs-secondary/etc-hosts-refactor into lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk.
=== modified file 'hooks/common.py'
--- hooks/common.py 2015-05-12 21:52:31 +0000
+++ hooks/common.py 2015-06-19 15:38:53 +0000
@@ -67,7 +67,8 @@
namenode_master,
],
'callbacks': [
- namenode_master.update_etc_hosts,
+ namenode_master.register_provided_hosts,
+ jujubigdata.utils.manage_etc_hosts,
namenode_master.install_ssh_keys,
hdfs.configure_secondarynamenode,
hdfs.start_secondarynamenode,
=== modified file 'resources.yaml'
--- resources.yaml 2015-06-10 21:51:52 +0000
+++ resources.yaml 2015-06-19 15:38:53 +0000
@@ -8,7 +8,11 @@
six:
pypi: six
jujubigdata:
+<<<<<<< TREE
pypi: jujubigdata>=1.2.10,<2.0.0
+=======
+ pypi: jujubigdata>=2.0.0,<3.0.0
+>>>>>>> MERGE-SOURCE
charmhelpers:
pypi: http://bazaar.launchpad.net/~bigdata-dev/bigdata-data/trunk/download/kevin.monroe%40canonical.com-20150610215108-gq4ud2rriy1sp1h6/charmhelpers0.3.1.ta-20150610215050-vxrqhizdsrqwnmcm-1/charmhelpers-0.3.1.tar.gz
hash: 061fe7204289b96fab5d3ca02883040ea3026526ebf0ad38e21457527a18d139
Follow ups