bigdata-dev team mailing list archive

[Kevin W Monroe <kevin.monroe@xxxxxxxxxxxxx>]

Kevin W Monroe has proposed merging lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/unstable into lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/trunk.

Requested reviews:
  Juju Big Data Development (bigdata-dev)

For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/unstable/+merge/277619
-- 
Your team Juju Big Data Development is requested to review the proposed merge of lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/unstable into lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/trunk.

=== modified file 'dist.yaml'
--- dist.yaml	2015-08-06 14:46:06 +0000
+++ dist.yaml	2015-11-16 19:21:28 +0000
@@ -2,7 +2,7 @@
 # The aim is to make it easier to update / extend the charms with
 # minimal changes to the shared code in charmhelpers.
 vendor: 'apache'
-hadoop_version: '2.4.1'
+hadoop_version: '2.7.1'
 packages:
     - 'libsnappy1'
     - 'libsnappy-dev'

=== modified file 'resources.yaml'
--- resources.yaml	2015-11-16 19:04:23 +0000
+++ resources.yaml	2015-11-16 19:21:28 +0000
@@ -4,7 +4,10 @@
   pathlib:
     pypi: path.py>=7.0
   jujubigdata:
-    pypi: jujubigdata>=4.0.0,<5.0.0
+    pypi: jujubigdata.tar.gz
+    hash: 19f41bd85d9ed3f35f490d44c986dd5560eb262f6c3e66b1c63a4046d0cba268
+    hash_type: sha256
+    #pypi: jujubigdata>=4.0.0,<5.0.0
   java-installer:
     # This points to a script which manages installing Java.
     # If replaced with an alternate implementation, it must output *only* two
@@ -30,7 +33,18 @@
     url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz
     hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b672
     hash_type: sha256
+<<<<<<< TREE
   hadoop-lzo-x86_64:
     url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-lzo-0.4.20-SNAPSHOT-x86_64-98421de6.tgz
     hash: 98421de6bea220c1531b50403de7b4d6e49955e9104d7cf15d943fe2ba45e295
     hash_type: sha256
+=======
+  hadoop-2.4.1-x86_64:
+    url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz
+    hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b672
+    hash_type: sha256
+  hadoop-2.7.1-x86_64:
+    url: http://mirrors.ukfast.co.uk/sites/ftp.apache.org/hadoop/common/hadoop-2.7.1/hadoop-2.7.1.tar.gz
+    hash: 991dc34ea42a80b236ca46ff5d207107bcc844174df0441777248fdb6d8c9aa0
+    hash_type: sha256
+>>>>>>> MERGE-SOURCE