Merge remote-tracking branch 'origin/master' into BIGTOP-2320
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/937c26c7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/937c26c7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/937c26c7 Branch: refs/heads/BIGTOP-2320 Commit: 937c26c7a578bd98acb0cc288a006a50bbc75ef5 Parents: 30ec435 3ff4417 Author: Konstantin Boudnik <[email protected]> Authored: Wed Feb 24 22:03:43 2016 -0800 Committer: Konstantin Boudnik <[email protected]> Committed: Wed Feb 24 22:03:43 2016 -0800 ---------------------------------------------------------------------- MAINTAINERS.txt | 1 + .../bigpetstore-mapreduce/BPS_analytics.pig | 2 +- .../src/common/tajo/do-component-build | 28 +++ bigtop-packages/src/common/tajo/install_tajo.sh | 156 +++++++++++++++ .../src/common/tajo/tajo-env.default | 97 +++++++++ bigtop-packages/src/common/tajo/tajo-master.svc | 76 +++++++ bigtop-packages/src/common/tajo/tajo-worker.svc | 76 +++++++ bigtop-packages/src/deb/tajo/compat | 1 + bigtop-packages/src/deb/tajo/control | 43 ++++ bigtop-packages/src/deb/tajo/copyright | 15 ++ bigtop-packages/src/deb/tajo/rules | 41 ++++ bigtop-packages/src/deb/tajo/source/format | 1 + bigtop-packages/src/deb/tajo/tajo.install | 13 ++ bigtop-packages/src/deb/tajo/tajo.postinst | 35 ++++ bigtop-packages/src/deb/tajo/tajo.preinst | 62 ++++++ bigtop-packages/src/deb/tajo/tajo.prerm | 38 ++++ bigtop-packages/src/rpm/tajo/SPECS/tajo.spec | 199 +++++++++++++++++++ bigtop-tests/build.gradle | 11 +- bigtop.bom | 20 +- build.gradle | 1 + docker/bigtop-deploy/centos-7/Dockerfile | 40 ++++ docker/bigtop-deploy/centos-7/build.sh | 20 ++ docker/bigtop-puppet/ubuntu-15.04/Dockerfile | 20 ++ docker/bigtop-puppet/ubuntu-15.04/build.sh | 16 ++ docker/bigtop-slaves/ubuntu-15.04/Dockerfile | 24 +++ docker/pseudo-cluster/Dockerfile | 31 +++ docker/pseudo-cluster/config/configure.sh | 25 +++ .../pseudo-cluster/config/hieradata/site.yaml | 10 + packages.gradle | 3 +- pom.xml | 3 +- src/site/xdoc/index.xml | 4 +- 31 files changed, 1098 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/937c26c7/bigtop.bom ---------------------------------------------------------------------- diff --cc bigtop.bom index 1a58df1,2f1abc9..8ee61f4 --- a/bigtop.bom +++ b/bigtop.bom @@@ -90,7 -90,8 +90,12 @@@ bigtop zookeeper:['hadoop', 'hbase'], hadoop:['ignite-hadoop', 'hbase', 'crunch', 'pig', 'hive', 'tez', 'sqoop', 'sqoop2', 'oozie', 'mahout', 'flume', 'giraph', 'solr', 'crunch', 'spark', ++<<<<<<< HEAD + 'phoenix', 'tachyon', 'kafka', 'ycsb', 'kite', 'hama', 'zeppelin', 'hawq' ++======= + 'phoenix', 'tachyon', 'kafka', 'ycsb', 'kite', 'hama', 'zeppelin', + 'tajo' ++>>>>>>> origin/master ], hbase:['phoenix','giraph','ycsb'], pig:['datafu', 'oozie'], @@@ -401,15 -402,15 +406,24 @@@ site = "${apache.APACHE_MIRROR}/${download_path}" archive = "${apache.APACHE_ARCHIVE}/${download_path}" } } + 'tajo' { + name = 'tajo' + relNotes = 'Apache Tajo' + version { base = '0.11.1'; pkg = base; release = 1 } + tarball { source = "$name-${version.base}-src.tar.gz" + destination = "$name-${version.base}.tar.gz" } + url { download_path = "/$name/$name-${version.base}" + site = "${apache.APACHE_MIRROR}/${download_path}" + archive = "${apache.APACHE_ARCHIVE}/${download_path}" } + } + 'hawq' { + name = 'hawq' + relNotes = 'Apache HAWQ (incubating)' + version { base = '2.0.0'; pkg = base; release = 1 } + tarball { source = "${version.base}-beta-incubating-RC4.tar.gz" + destination = "incubator-${name}-${version.base}-beta-incubating-RC4.tar.gz" } + url { download_path = "/apache/incubator-$name/archive" + site = "https://github.com/${download_path}"; + archive = site } - } } }
