Merge branch 'master' of github.com:apache/incubator-trafodion into TRAFODION-2034
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/70631ba7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/70631ba7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/70631ba7 Branch: refs/heads/master Commit: 70631ba71c07745422606040d31f34d9431405af Parents: 005f381 67c1677 Author: Amanda Moran <ama...@apache.com> Authored: Wed Jul 6 23:01:34 2016 +0000 Committer: Amanda Moran <ama...@apache.com> Committed: Wed Jul 6 23:01:34 2016 +0000 ---------------------------------------------------------------------- core/conn/odb/src/odb.c | 4 +- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 143 +++-- core/sqf/sql/scripts/install_local_hadoop | 33 +- core/sql/bin/SqlciErrors.txt | 4 +- core/sql/cli/Statement.cpp | 4 + core/sql/exp/ExpError.cpp | 25 + core/sql/exp/ExpError.h | 5 + core/sql/exp/exp_conv.cpp | 153 ++--- core/sql/exp/exp_datetime.cpp | 178 +++++- core/sql/exp/exp_function.cpp | 33 +- core/sql/regress/core/EXPECTED038.LINUX | 2 +- core/sql/regress/executor/EXPECTED022.SB | 152 ++--- core/sql/regress/executor/EXPECTED050 | 4 +- core/sql/regress/hive/EXPECTED005 | 10 +- core/sql/regress/seabase/EXPECTED030 | 6 +- docs/client_install/pom.xml | 1 + docs/command_interface/pom.xml | 1 + docs/cqd_reference/pom.xml | 1 + docs/jdbct4ref_guide/pom.xml | 1 + docs/load_transform/pom.xml | 1 + docs/messages_guide/pom.xml | 1 + docs/odb_user/pom.xml | 1 + docs/provisioning_guide/pom.xml | 1 + .../src/asciidoc/_chapters/prepare.adoc | 43 +- .../src/asciidoc/_chapters/quickstart.adoc | 597 +++++++++++++++++++ .../src/asciidoc/_chapters/requirements.adoc | 8 +- .../src/asciidoc/_chapters/script_install.adoc | 371 ++++++------ .../src/asciidoc/_chapters/script_upgrade.adoc | 260 ++++---- docs/provisioning_guide/src/asciidoc/index.adoc | 1 + docs/shared/license.txt | 5 + docs/shared/revisions.txt | 4 +- docs/spj_guide/pom.xml | 1 + docs/sql_reference/pom.xml | 1 + docs/src/site/markdown/download.md | 24 +- docs/src/site/markdown/index.md | 8 +- docs/src/site/markdown/release-notes-2-0-1.md | 10 +- docs/src/site/resources/css/site.css | 1 + docs/src/site/site.xml | 12 +- 38 files changed, 1452 insertions(+), 658 deletions(-) ----------------------------------------------------------------------
