You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/01/16 16:02:51 UTC

[4/4] trafodion git commit: [TRAFODION-2861] Backport to release2.2 branch

[TRAFODION-2861] Backport to release2.2 branch


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

Branch: refs/heads/release2.2
Commit: 5be0d2e5eacc4a48aeb5b407e5eacf76f5b10ec2
Parents: 3254cc1 6429a0c
Author: Liu Ming <ov...@sina.com>
Authored: Sun Jan 14 02:43:21 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Sun Jan 14 02:43:21 2018 +0000

----------------------------------------------------------------------
 DISCLAIMER                                      | 12 -----
 Makefile                                        | 14 +++---
 README                                          | 10 ++--
 README.md                                       |  8 +--
 core/Makefile                                   |  2 +-
 core/conn/Makefile                              |  7 +--
 core/conn/jdbcT4/pom.xml                        |  6 +--
 core/sqf/.gitignore                             |  2 -
 core/sqf/Makefile                               | 12 ++---
 core/sqf/sql/scripts/install_apache_hadoop      |  4 +-
 core/sql/exp/exp_conv.cpp                       |  2 +-
 core/trafodion.spec                             |  2 +-
 docs/client_install/pom.xml                     | 26 +++++-----
 .../src/asciidoc/_chapters/introduction.adoc    |  2 +-
 .../src/asciidoc/_chapters/jdbct4.adoc          |  2 +-
 .../src/asciidoc/_chapters/preparation.adoc     | 11 ++---
 .../src/asciidoc/_chapters/sample_prog.adoc     |  6 +--
 docs/command_interface/pom.xml                  | 22 ++++-----
 docs/cqd_reference/pom.xml                      | 22 ++++-----
 docs/jdbct4ref_guide/pom.xml                    | 22 ++++-----
 docs/load_transform/pom.xml                     | 22 ++++-----
 docs/messages_guide/pom.xml                     | 22 ++++-----
 docs/odb_user/pom.xml                           | 22 ++++-----
 docs/provisioning_guide/pom.xml                 | 26 +++++-----
 .../src/asciidoc/_chapters/about.adoc           |  2 +-
 .../src/asciidoc/_chapters/enable_security.adoc |  4 +-
 .../src/asciidoc/_chapters/introduction.adoc    |  4 +-
 .../src/asciidoc/_chapters/quickstart.adoc      | 22 ++++-----
 .../src/asciidoc/_chapters/script_install.adoc  | 10 ++--
 .../src/asciidoc/_chapters/script_remove.adoc   |  2 +-
 .../src/asciidoc/_chapters/script_upgrade.adoc  |  6 +--
 docs/shared/license.txt                         |  5 --
 docs/spj_guide/pom.xml                          | 22 ++++-----
 .../src/asciidoc/_chapters/deploy_spjs.adoc     |  2 +-
 .../src/resources/source/Inventory.java         |  6 +--
 .../spj_guide/src/resources/source/Payroll.java |  8 +--
 docs/spj_guide/src/resources/source/Sales.java  | 12 ++---
 .../src/resources/source/adjustSalary.java      |  2 +-
 .../src/resources/source/employeeJob.java       |  2 +-
 .../src/resources/source/lowerPrice.java        |  2 +-
 .../src/resources/source/numDailyOrders.java    |  2 +-
 .../src/resources/source/numMonthlyOrders.java  |  2 +-
 .../src/resources/source/orderSummary.java      |  2 +-
 .../src/resources/source/partData.java          |  2 +-
 .../src/resources/source/partLocations.java     |  2 +-
 .../src/resources/source/projectTeam.java       |  2 +-
 .../src/resources/source/supplierInfo.java      |  2 +-
 .../src/resources/source/supplyQuantities.java  |  2 +-
 .../src/resources/source/topSalesReps.java      |  2 +-
 .../src/resources/source/totalPrice.java        |  2 +-
 docs/sql_reference/pom.xml                      | 22 ++++-----
 docs/src/site/markdown/download.md              |  2 +-
 .../site/markdown/enable-secure-trafodion.md    |  2 +-
 docs/src/site/markdown/index.md                 | 10 ++--
 docs/src/site/markdown/ldapcheck.md             |  2 +-
 docs/src/site/markdown/ldapconfigcheck.md       |  2 +-
 docs/src/site/markdown/quickstart.md            |  6 +--
 docs/src/site/markdown/release-notes-1-0-1.md   |  2 +-
 docs/src/site/site.xml                          | 10 ++--
 install/.gitignore                              |  1 -
 install/Makefile                                |  7 +--
 install/ambari-installer/Makefile               |  6 +--
 install/ambari-installer/traf_ambari.spec       |  2 +-
 licenses/Makefile                               |  5 +-
 licenses/lic-server-src                         | 32 ++++++------
 licenses/lic-test-src                           |  6 +--
 pom.xml                                         | 52 ++++++++++----------
 tools/docker/Dockerfile                         |  4 +-
 tools/docker/start-compile-docker.sh            |  6 +--
 69 files changed, 275 insertions(+), 321 deletions(-)
----------------------------------------------------------------------