You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2017/02/01 01:00:47 UTC
[2/4] incubator-trafodion git commit: Merge branch 'master' into
mrg-932
Merge branch 'master' into mrg-932
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/598dc5ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/598dc5ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/598dc5ed
Branch: refs/heads/master
Commit: 598dc5ed0aa01ece1bd09de039febaf866fec017
Parents: 3209431 c47d84f
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Tue Jan 31 17:02:54 2017 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Tue Jan 31 17:02:54 2017 +0000
----------------------------------------------------------------------
core/sql/ustat/hs_cli.cpp | 21 +++-
core/sql/ustat/hs_parser.cpp | 13 +++
install/.gitignore | 3 +-
install/ambari-installer/Makefile | 26 +++--
install/ambari-installer/meta.template | 34 ++++++
.../mpack-install/am_install.sh | 17 ++-
install/ambari-installer/mpack.json | 46 ++++++++
install/ambari-installer/repo.template | 2 +-
.../2.1/package/scripts/trafodiondcs.py | 2 +-
.../2.1/package/scripts/trafodionnode.py | 8 +-
.../custom-services/TRAFODION/2.1/metainfo.xml | 34 ------
install/ambari-installer/traf-mpack/mpack.json | 46 --------
install/ambari-installer/traf_ambari.spec | 14 ++-
install/python-installer/db_uninstall.py | 114 +++++++++++++++++++
install/python-installer/scripts/hadoop_mods.py | 4 +
15 files changed, 275 insertions(+), 109 deletions(-)
----------------------------------------------------------------------