Repository: bigtop Updated Branches: refs/heads/master 20bfd7d0a -> 73864a30b
BIGTOP-2764: tweak spark-datanucleus workaround Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/73864a30 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/73864a30 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/73864a30 Branch: refs/heads/master Commit: 73864a30b29ee89655772ce82b4041c2564d0711 Parents: 20bfd7d Author: Kevin W Monroe <[email protected]> Authored: Wed May 10 16:32:24 2017 +0000 Committer: Evans Ye <[email protected]> Committed: Sat May 13 01:00:44 2017 +0800 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/spark/manifests/init.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/73864a30/bigtop-deploy/puppet/modules/spark/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/spark/manifests/init.pp b/bigtop-deploy/puppet/modules/spark/manifests/init.pp index 1b2ff6b..4c72d20 100644 --- a/bigtop-deploy/puppet/modules/spark/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/spark/manifests/init.pp @@ -148,14 +148,13 @@ class spark { $history_log_dir = "hdfs:///var/log/spark/apps", ) { - package { 'spark-core': - ensure => latest, - } ### This is an ungodly hack to deal with the consequence of adding ### unconditional hive-support into Spark ### The addition is tracked by BIGTOP-2154 ### The real fix will come in BIGTOP-2268 - package { 'spark-datanucleus': + include spark::datanucleus + + package { 'spark-core': ensure => latest, }
