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

Proposed by Kevin W Monroe on 2015-11-16
Status: Merged
Merged at revision: 128
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/unstable
Merge into: lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/trunk
Diff against target: 35 lines (+12/-1) (has conflicts)
2 files modified
dist.yaml (+1/-1)
resources.yaml (+11/-0)
Text conflict in resources.yaml
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/unstable
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve on 2015-11-16
Review via email: mp+277617@code.launchpad.net
To post a comment you must log in.
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
1=== modified file 'dist.yaml'
2--- dist.yaml 2015-08-06 17:18:13 +0000
3+++ dist.yaml 2015-11-16 19:20:44 +0000
4@@ -2,7 +2,7 @@
5 # The aim is to make it easier to update / extend the charms with
6 # minimal changes to the shared code in charmhelpers.
7 vendor: 'apache'
8-hadoop_version: '2.4.1'
9+hadoop_version: '2.7.1'
10 packages:
11 - 'libsnappy1'
12 - 'libsnappy-dev'
13
14=== modified file 'resources.yaml'
15--- resources.yaml 2015-11-16 19:06:18 +0000
16+++ resources.yaml 2015-11-16 19:20:44 +0000
17@@ -32,7 +32,18 @@
18 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz
19 hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b672
20 hash_type: sha256
21+<<<<<<< TREE
22 hadoop-lzo-x86_64:
23 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-lzo-0.4.20-SNAPSHOT-x86_64-98421de6.tgz
24 hash: 98421de6bea220c1531b50403de7b4d6e49955e9104d7cf15d943fe2ba45e295
25 hash_type: sha256
26+=======
27+ hadoop-2.4.1-x86_64:
28+ url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz
29+ hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b672
30+ hash_type: sha256
31+ hadoop-2.7.1-x86_64:
32+ url: http://mirrors.ukfast.co.uk/sites/ftp.apache.org/hadoop/common/hadoop-2.7.1/hadoop-2.7.1.tar.gz
33+ hash: 991dc34ea42a80b236ca46ff5d207107bcc844174df0441777248fdb6d8c9aa0
34+ hash_type: sha256
35+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: