You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/12/15 19:50:55 UTC
[4/8] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into installbugfixes
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/5059a84a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5059a84a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5059a84a
Branch: refs/heads/master
Commit: 5059a84afc93609ceb3e40997001ebd6d46c40a6
Parents: eab5e35 2d69b73
Author: Amanda Moran <am...@apache.com>
Authored: Thu Dec 10 18:01:19 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Thu Dec 10 18:01:19 2015 +0000
----------------------------------------------------------------------
.../transactional/TrxRegionEndpoint.java | 296 ++++++++++++++-----
.../transactional/TrxTransactionState.java | 57 +++-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/executor/ExExeUtilGet.cpp | 2 +
core/sql/regress/catman1/EXPECTED135 | 2 +
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 15 +
core/sql/sqlcomp/CmpSeabaseDDLauth.h | 2 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 11 +-
docs/.gitignore | 1 +
install/.gitignore | 1 +
10 files changed, 301 insertions(+), 88 deletions(-)
----------------------------------------------------------------------