trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ama...@apache.org
Subject [2/7] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Date Thu, 18 Feb 2016 23:29:00 GMT
Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes


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

Branch: refs/heads/master
Commit: 9cdd07b83fc1d534f4574a1aeb364faed5b054b9
Parents: 7b65d95 3aef621
Author: Amanda Moran <amanda@apache.com>
Authored: Mon Feb 8 18:35:37 2016 +0000
Committer: Amanda Moran <amanda@apache.com>
Committed: Mon Feb 8 18:35:37 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |    4 +-
 DISCLAIMER                                      |   12 +
 DISCLAIMER.txt                                  |   12 -
 LICENSE                                         |  301 ++
 LICENSE.txt                                     |  327 --
 NOTICE                                          |    9 +
 NOTICE.txt                                      |    9 -
 RAT_README                                      |  192 +
 RAT_README.txt                                  |  192 -
 README                                          |   58 +
 README.txt                                      |   58 -
 core/conn/odbc/src/odbc/nsksrvr/Makefile        |    2 +-
 core/rest/src/main/asciidoc/_chapters/apis.adoc |   20 +
 .../java/org/trafodion/rest/ServerResource.java |   94 +
 core/sqf/LocalSettingsTemplate.sh               |    3 +
 core/sqf/monitor/linux/amqpmon.cxx              |  231 -
 core/sqf/monitor/linux/amqpmon.h                |   71 -
 core/sqf/monitor/linux/makefile                 |    2 +-
 core/sqf/sqenvcom.sh                            |    2 +-
 core/sqf/sql/scripts/genms                      |    3 +-
 core/sqf/sqvers                                 |    2 +-
 core/sqf/src/tm/Makefile                        |    8 +-
 core/sqf/src/tm/dtm.events.pb.cc                | 1185 -----
 core/sqf/src/tm/dtm.events.pb.h                 |  709 ---
 core/sqf/src/tm/dtm.perf_stats.pb.cc            | 4081 ------------------
 core/sqf/src/tm/dtm.perf_stats.pb.h             | 2442 -----------
 core/sqf/src/tm/idtmsrv.cpp                     |   48 +-
 core/sql/common/DateTimeType.cpp                |   69 +-
 core/sql/common/DatetimeType.h                  |    8 +-
 core/sql/executor/ExExeUtilGet.cpp              |   32 +-
 core/sql/exp/exp_clause_derived.h               |    8 +-
 core/sql/exp/exp_conv.cpp                       |   55 +-
 core/sql/exp/exp_datetime.cpp                   |  456 +-
 core/sql/exp/exp_datetime.h                     |   43 +-
 core/sql/exp/exp_function.cpp                   |   16 +-
 core/sql/nskgmake/Makerules.linux               |    5 +-
 core/sql/optimizer/ItemExpr.cpp                 |    7 +-
 core/sql/optimizer/NormRelExpr.cpp              |   52 +-
 core/sql/parser/SqlParserAux.cpp                |   18 +-
 core/sql/parser/sqlparser.y                     |    4 +-
 core/sql/regress/core/EXPECTED116               |  301 +-
 core/sql/regress/core/FILTER116                 |   33 +
 core/sql/regress/core/TEST116                   |   55 +-
 core/sql/regress/executor/EXPECTED015.SB        |   98 +-
 core/sql/regress/executor/EXPECTED022.LINUX     |  488 ++-
 core/sql/regress/executor/TEST015               |   33 +-
 core/sql/regress/executor/TEST022               |   38 +
 core/sql/regress/seabase/EXPECTED012            |   53 +-
 core/sql/regress/seabase/EXPECTED013            |   40 +-
 core/sql/regress/seabase/TEST012                |   18 +
 core/sql/regress/seabase/TEST013                |   20 +-
 core/sql/regress/tools/runregr_core.ksh         |    4 +-
 core/sql/sqlcomp/DefaultConstants.h             |    5 +
 core/sql/sqlcomp/QCache.cpp                     |   30 +-
 core/sql/sqlcomp/nadefaults.cpp                 |    3 +
 core/sql/sqlmxevents/logmxevent_sq.cpp          |    2 +-
 docs/src/site/markdown/documentation.md         |   15 +-
 install/installer/traf_package_setup            |    4 +-
 install/traf_tools_setup.sh                     |  221 +-
 licenses/LICENSE-bsd2                           |   14 -
 licenses/LICENSE-bsd3                           |   14 +
 licenses/LICENSE-jquery                         |    7 +
 licenses/LICENSE-js                             |    2 +
 63 files changed, 2331 insertions(+), 10017 deletions(-)
----------------------------------------------------------------------



Mime
View raw message