trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [13/14] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf
Date Sun, 25 Sep 2016 01:57:50 GMT
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf


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

Branch: refs/heads/master
Commit: 5e55eb9fb3d5b45167e27d3f54b52c6374d1db7d
Parents: 8764170 3ad30f5
Author: Sean Broeder <sbroeder@edev06.esgyn.local>
Authored: Fri Sep 23 16:43:09 2016 +0000
Committer: Sean Broeder <sbroeder@edev06.esgyn.local>
Committed: Fri Sep 23 16:43:09 2016 +0000

----------------------------------------------------------------------
 core/sqf/export/include/seabed/mslimits.h       |  4 +-
 core/sqf/monitor/linux/msgdef.h                 |  8 +--
 core/sqf/sql/scripts/sqnodes.pm                 |  4 +-
 .../tm/hbasetmlib2/javaobjectinterfacetm.cpp    | 74 ++++++++++++--------
 .../tm/hbasetmlib2/javaobjectinterfacetm.h      |  2 +
 core/sqf/src/tm/tm.cpp                          |  2 +-
 core/sqf/src/tm/tminfo.cpp                      |  2 -
 core/sqf/src/tm/tmlogging.cpp                   | 15 +++-
 core/sql/bin/SqlciErrors.txt                    |  8 +--
 core/sql/executor/JavaObjectInterface.cpp       | 32 +++++----
 core/sql/executor/JavaObjectInterface.h         |  2 +
 core/sql/regress/compGeneral/EXPECTED023        | 70 +++++++++---------
 core/sql/regress/compGeneral/TEST023            |  7 ++
 core/sql/sqlcomp/DefaultConstants.h             |  2 -
 core/sql/sqlcomp/nadefaults.cpp                 |  5 --
 core/sql/ustat/hs_cli.cpp                       |  7 +-
 core/sql/ustat/hs_const.h                       |  5 +-
 core/sql/ustat/hs_globals.cpp                   | 34 ++++++---
 core/sql/ustat/hs_yacc.y                        | 48 +++----------
 .../asciidoc/_chapters/update_stats_msgs.adoc   | 15 ++++
 install/installer/traf_sqconfig                 |  4 +-
 21 files changed, 195 insertions(+), 155 deletions(-)
----------------------------------------------------------------------



Mime
View raw message