You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2016/09/30 21:05:50 UTC
[03/12] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into sean_traf
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/d7232d3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d7232d3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d7232d3f
Branch: refs/heads/master
Commit: d7232d3f816129464a3449cea56a10919794ddd2
Parents: 0ccafa2 1e94882
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Wed Sep 28 23:19:20 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Wed Sep 28 23:19:20 2016 +0000
----------------------------------------------------------------------
.../export/include/common/evl_sqlog_eventnum.h | 41 +
core/sqf/monitor/linux/cluster.cxx | 249 ++-
core/sqf/monitor/linux/cluster.h | 1 +
core/sqf/monitor/linux/makefile | 25 +-
core/sqf/monitor/linux/monitor.cxx | 187 +++
core/sqf/monitor/linux/monitor.h | 2 +
core/sqf/monitor/linux/zclient.cxx | 1432 ++++++++++++++++++
core/sqf/monitor/linux/zclient.h | 116 ++
core/sqf/monitor/linux/zootest.cxx | 283 ++++
core/sqf/monitor/linux/zootest.h | 34 +
core/sqf/sqenvcom.sh | 19 +-
core/sqf/sql/scripts/sqcheck | 27 +-
core/sql/bin/SqlciErrors.txt | 4 +-
core/sql/regress/compGeneral/EXPECTED023 | 2 +-
core/sql/regress/hive/EXPECTED018 | 183 ++-
core/sql/regress/privs1/EXPECTED132 | 100 +-
core/sql/regress/privs1/EXPECTED136 | 2 +
core/sql/regress/privs2/EXPECTED129 | 23 +-
core/sql/regress/privs2/EXPECTED135 | 17 +-
core/sql/regress/privs2/EXPECTED138 | 22 +
core/sql/regress/privs2/EXPECTED139 | 10 +
core/sql/regress/privs2/EXPECTED140 | 4 +-
core/sql/regress/privs2/EXPECTED142 | 6 +
core/sql/sqlcomp/PrivMgrDesc.cpp | 36 +-
core/sql/sqlcomp/PrivMgrDesc.h | 22 +-
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 1349 +++++++----------
core/sql/sqlcomp/PrivMgrPrivileges.h | 78 +-
core/sql/sqlcomp/nadefaults.cpp | 2 +-
.../org/trafodion/dcs/server/ServerManager.java | 115 +-
.../phoenix/end2end/MultiCfQueryExecTest.java | 2 +-
30 files changed, 3344 insertions(+), 1049 deletions(-)
----------------------------------------------------------------------