Merge remote branch 'origin/master' into ddlxns2_br

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

Branch: refs/heads/master
Commit: 1d614391f3beb8ffb999a9572027bacb85f16aa4
Parents: 0dc67ae 7b25750
Author: Anoop Sharma <[email protected]>
Authored: Tue Apr 26 13:07:11 2016 +0000
Committer: Anoop Sharma <[email protected]>
Committed: Tue Apr 26 13:07:11 2016 +0000

----------------------------------------------------------------------
 core/sqf/conf/install_features                  |   1 +
 core/sqf/sqenvcom.sh                            |  25 +-
 core/sql/cli/CliExtern.cpp                      |   2 +-
 core/sql/cli/SQLCLIdev.h                        |   7 -
 core/sql/cli/sqlcli.h                           |   6 +
 .../java/org/trafodion/libmgmt/FileMgmt.java    |   1 +
 core/sql/nskgmake/Makerules.mk                  |   6 +-
 core/sql/regress/core/FILTER116                 |   1 +
 core/sql/sqlci/SqlciEnv.cpp                     |   8 +-
 docs/src/site/markdown/index.md                 |   2 +-
 docs/src/site/resources/css/site.css            |   5 +
 docs/src/site/site.xml                          |   6 +-
 install/installer/traf_add_sudoAccess           |  10 +-
 install/installer/traf_apache_mods              | 247 ++++++++
 install/installer/traf_cloudera_mods            | 397 +++++++++++++
 install/installer/traf_cloudera_mods98          | 418 -------------
 install/installer/traf_config_check             |  92 ++-
 install/installer/traf_config_setup             | 307 ++++++++--
 install/installer/traf_getHadoopNodes           |   1 -
 install/installer/traf_getMultiHadoopNodes      | 145 +++++
 install/installer/traf_hortonworks_mods         | 572 ++++++++++++++++++
 install/installer/traf_hortonworks_mods98       | 592 -------------------
 install/installer/traf_package_setup            |   2 +-
 install/installer/trafodion_install             |  35 +-
 24 files changed, 1777 insertions(+), 1111 deletions(-)
----------------------------------------------------------------------


Reply via email to