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/05/12 07:52:17 UTC
[50/50] [abbrv] incubator-trafodion git commit: Merge remote branch
'origin/pr/1085/head' into merge_1085
Merge remote branch 'origin/pr/1085/head' into merge_1085
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c25694d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c25694d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c25694d9
Branch: refs/heads/master
Commit: c25694d9e30d01727649f4098a1dfd8476e5323b
Parents: ea31105 54a1b73
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri May 12 07:50:21 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri May 12 07:50:21 2017 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
core/conn/jdbcT4/pom.xml | 93 ++++++++++++
core/sqf/build-scripts/build.branch | 4 +-
core/sqf/sqenvcom.sh | 32 ++---
core/sqf/src/seabed/src/ms.cpp | 2 +
core/sql/cli/CliExtern.cpp | 23 ++-
core/sql/regress/seabase/EXPECTED022 | 143 ++++++-------------
core/sql/regress/seabase/TEST022 | 33 ++---
.../src/asciidoc/_chapters/ambari_install.adoc | 51 +++++--
docs/provisioning_guide/src/images/amb1.PNG | Bin 0 -> 46318 bytes
docs/provisioning_guide/src/images/amb2.PNG | Bin 0 -> 12063 bytes
docs/provisioning_guide/src/images/amb3.PNG | Bin 0 -> 13764 bytes
docs/provisioning_guide/src/images/amb4.PNG | Bin 0 -> 44413 bytes
docs/provisioning_guide/src/images/amb5.PNG | Bin 0 -> 10552 bytes
.../src/asciidoc/_chapters/olap_functions.adoc | 2 +-
.../sql_functions_and_expressions.adoc | 4 +-
install/ambari-installer/Makefile | 11 +-
.../2.1/configuration/traf-cluster-env.xml | 1 +
.../2.1/configuration/trafodion-env.xml | 4 +
.../TRAFODION/2.1/package/scripts/params.py | 2 +
.../2.1/package/scripts/trafodionmaster.py | 3 +-
install/python-installer/scripts/traf_check.py | 5 +
22 files changed, 249 insertions(+), 166 deletions(-)
----------------------------------------------------------------------