Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/unstable into lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/trunk

[Kevin W Monroe]

[Kevin W Monroe (kwmonroe)]

Fixed up the conflict, and pointed to our s3 bucket. +1, LGTM.

review: Approve

=== modified file 'dist.yaml'
--- dist.yaml	2015-08-06 17:18:13 +0000
+++ dist.yaml	2015-11-16 19:20:44 +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:06:18 +0000
+++ resources.yaml	2015-11-16 19:20:44 +0000
@@ -32,7 +32,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