Merge branch 'master' of ssh://diskstation/volume1/git/bigtop
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/52077c62 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/52077c62 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/52077c62 Branch: refs/heads/master Commit: 52077c6250925b8f470f0027ea79b077190e8e16 Parents: c2d3960 1540c4e Author: Olaf Flebbe <[email protected]> Authored: Sat May 9 20:43:37 2015 +0200 Committer: Olaf Flebbe <[email protected]> Committed: Sat May 9 20:43:37 2015 +0200 ---------------------------------------------------------------------- .../puppet/hieradata/bigtop/cluster.yaml | 4 ++ bigtop-deploy/puppet/hieradata/site.yaml | 1 + bigtop-deploy/puppet/manifests/cluster.pp | 8 ++++ .../modules/hadoop-hive/templates/hive-site.xml | 7 +++ .../puppet/modules/hadoop/manifests/init.pp | 2 +- .../modules/hadoop/templates/hadoop-env.sh | 12 +++-- .../modules/hadoop/templates/mapred-site.xml | 17 +++++++ .../puppet/modules/tez/manifests/init.pp | 22 +++++++++ bigtop-deploy/puppet/modules/tez/tests/init.pp | 17 +++++++ .../src/common/bigtop-utils/init-hcfs.groovy | 48 ++++++++++++++++++-- .../src/common/hadoop/init-hcfs.json | 5 +- bigtop-packages/src/rpm/hue/SPECS/hue.spec | 2 +- bigtop_toolchain/manifests/deps.pp | 4 +- bigtop_toolchain/manifests/gradle.pp | 10 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- packages.gradle | 9 ++-- 16 files changed, 146 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
