You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/04/03 04:22:03 UTC

[1/3] incubator-trafodion git commit: Added Notice, License, Disclaimer to amabari install RPM package

Repository: incubator-trafodion
Updated Branches:
  refs/heads/release2.1 560ad859f -> 14fd37b25


Added Notice,License, Disclaimer to amabari install RPM package


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/62216305
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/62216305
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/62216305

Branch: refs/heads/release2.1
Commit: 62216305d986663ad084dc7191d97603d25c210d
Parents: a48a06d
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Mar 31 18:42:23 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Mar 31 18:42:23 2017 +0000

----------------------------------------------------------------------
 NOTICE                            |  2 +-
 install/ambari-installer/Makefile | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62216305/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index bfb365e..edd4485 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Trafodion
-Copyright 2015-2016 The Apache Software Foundation
+Copyright 2015-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62216305/install/ambari-installer/Makefile
----------------------------------------------------------------------
diff --git a/install/ambari-installer/Makefile b/install/ambari-installer/Makefile
index 4e3ebd9..9edb405 100644
--- a/install/ambari-installer/Makefile
+++ b/install/ambari-installer/Makefile
@@ -36,7 +36,7 @@ all: rpmbuild
 # select trafodion version for given HDP stack
 REPO_LIST= $(TRAFODION_VER) # for now, list is current release only
 
-$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE repofiles traf-mpack/mpack.json
+$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE mpack-install/NOTICE mpack-install/DISCLAIMER repofiles traf-mpack/mpack.json
 	rm -rf $(RPMROOT)
 	mkdir -p $(SOURCEDIR)
 	tar czf $@ traf-mpack mpack-install
@@ -62,6 +62,12 @@ mpack-install/LICENSE: ../../licenses/LICENSE-install
 ../../licenses/LICENSE-install:
 	cd $(@D) && $(MAKE) $(@F)
 
+mpack-install/NOTICE: ../../NOTICE
+	cp -f $? $@
+
+mpack-install/DISCLAIMER: ../../DISCLAIMER
+	cp -f $? $@
+
 rpmbuild: $(SOURCEDIR)/ambari_rpm.tar.gz
 	mkdir -p $(RPMDIR)
 	mkdir -p $(BUILDDIR)
@@ -82,6 +88,9 @@ rpmbuild: $(SOURCEDIR)/ambari_rpm.tar.gz
 clean:
 	rm -rf $(RPMROOT)
 	rm -rf mpack-install/LICENSE
+	rm -rf mpack-install/NOTICE
+	rm -rf mpack-install/DISCLAIMER
 	rm -rf traf-mpack/custom-services/TRAFODION/*/repos
 	rm -f traf-mpack/custom-services/TRAFODION/*/metainfo.xml
 	rm -rf traf-mpack/mpack.json
+


[3/3] incubator-trafodion git commit: Merge TRAFODION-2570/2572

Posted by sa...@apache.org.
Merge TRAFODION-2570/2572


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/14fd37b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/14fd37b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/14fd37b2

Branch: refs/heads/release2.1
Commit: 14fd37b2550515ae0bc58d6ab0fe18a892087d1f
Parents: 560ad85 357ad47
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Apr 3 04:21:44 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Apr 3 04:21:44 2017 +0000

----------------------------------------------------------------------
 NOTICE                            |  2 +-
 core/sqf/sqenvcom.sh              | 28 +++++++++-------------------
 install/ambari-installer/Makefile | 11 ++++++++++-
 3 files changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------



[2/3] incubator-trafodion git commit: Remove misleading Hadoop distro version messages.

Posted by sa...@apache.org.
Remove misleading Hadoop distro version messages.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/357ad474
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/357ad474
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/357ad474

Branch: refs/heads/release2.1
Commit: 357ad47414cb1000456bd73181624637787eea5a
Parents: 6221630
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Sun Apr 2 04:31:23 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Sun Apr 2 04:31:23 2017 +0000

----------------------------------------------------------------------
 core/sqf/sqenvcom.sh | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/357ad474/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index da93e74..89a8437 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -491,12 +491,6 @@ else
   function vanilla_apache_usage {
 
   cat <<EOF
-    If you haven't set HBASE_DISTRO, please set it before source current file
-      export HBASE_DISTRO=APACHE1.0 (APACHE HBASE1.0)
-      export HBASE_DISTRO=APACHE1.1 (APACHE HBASE1.1)
-      export HBASE_DISTRO=CDH5.4    (cloudera 1.0.0-cdh5.4.4) 
-      export HBASE_DISTRO=CDH5.5    (cloudera 1.0.0-cdh5.5.1) 
-      export HBASE_DISTRO=HDP       (hortonworks 2.3)
 
     If you are ready to build Trafodion, perform one of the following options:
 
@@ -504,19 +498,15 @@ else
       make package     (Build Trafodion, DCS, REST, and Client drivers)  OR
       make package-all (Build Trafodion, DCS, REST, Client drivers, and Tests)
 
-    If Trafodion has been built and you want test: 
-
-       Execute the install_local_hadoop script which performs a single node
-       install using a popular Hadoop distribution 
-
-          cd $TRAF_HOME/sql/scripts
-          install_local_hadoop [-p <port option>]
-          install_traf_components 
-          configure Trafodion and start the processes
-          HAVE FUN!
-
-   You can also choose to install_local_hadoop before building Trafodion.
-
+   If Trafodion has been built and you want test: 
+   Ensure Hadoop is installed :
+    Follow instructions for user environment : 
+    http://trafodion.apache.org/docs/provisioning_guide/index.html
+    Follow instructions for dev environment at :  
+    https://cwiki.apache.org/confluence/display/TRAFODION/Create+Test+Environment
+                              
+   You can also choose to install hadoop before building Trafodion.
+                        HAVE FUN!
 EOF
   }