Juju Charms Collection
apache-hadoop-hdfs-master package

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

  1. Trusty Tahr (14.04)
  2. unstable
  3. Merge into trunk
Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 113
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/unstable
Merge into: lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/trunk
Diff against target: 47 lines (+16/-2) (has conflicts)
2 files modified
dist.yaml (+1/-1)
resources.yaml (+15/-1)
Text conflict in resources.yaml
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/apache-hadoop-hdfs-master/unstable
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+277619@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2# The aim is to make it easier to update / extend the charms with2# The aim is to make it easier to update / extend the charms with
3# minimal changes to the shared code in charmhelpers.3# minimal changes to the shared code in charmhelpers.
4vendor: 'apache'4vendor: 'apache'
5hadoop_version: '2.4.1'5hadoop_version: '2.7.1'
6packages:6packages:
7 - 'libsnappy1'7 - 'libsnappy1'
8 - 'libsnappy-dev'8 - 'libsnappy-dev'
99
=== 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 @@
4 pathlib:4 pathlib:
5 pypi: path.py>=7.05 pypi: path.py>=7.0
6 jujubigdata:6 jujubigdata:
7 pypi: jujubigdata>=4.0.0,<5.0.07 pypi: jujubigdata.tar.gz
8 hash: 19f41bd85d9ed3f35f490d44c986dd5560eb262f6c3e66b1c63a4046d0cba268
9 hash_type: sha256
10 #pypi: jujubigdata>=4.0.0,<5.0.0
8 java-installer:11 java-installer:
9 # This points to a script which manages installing Java.12 # This points to a script which manages installing Java.
10 # If replaced with an alternate implementation, it must output *only* two13 # If replaced with an alternate implementation, it must output *only* two
@@ -30,7 +33,18 @@
30 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz33 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz
31 hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b67234 hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b672
32 hash_type: sha25635 hash_type: sha256
36<<<<<<< TREE
33 hadoop-lzo-x86_64:37 hadoop-lzo-x86_64:
34 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-lzo-0.4.20-SNAPSHOT-x86_64-98421de6.tgz38 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-lzo-0.4.20-SNAPSHOT-x86_64-98421de6.tgz
35 hash: 98421de6bea220c1531b50403de7b4d6e49955e9104d7cf15d943fe2ba45e29539 hash: 98421de6bea220c1531b50403de7b4d6e49955e9104d7cf15d943fe2ba45e295
36 hash_type: sha25640 hash_type: sha256
41=======
42 hadoop-2.4.1-x86_64:
43 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz
44 hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b672
45 hash_type: sha256
46 hadoop-2.7.1-x86_64:
47 url: http://mirrors.ukfast.co.uk/sites/ftp.apache.org/hadoop/common/hadoop-2.7.1/hadoop-2.7.1.tar.gz
48 hash: 991dc34ea42a80b236ca46ff5d207107bcc844174df0441777248fdb6d8c9aa0
49 hash_type: sha256
50>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: