You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/03/31 21:29:13 UTC
[2/6] incubator-trafodion git commit: Merge branch 'master' of
git://git.apache.org/incubator-trafodion into TRAFODION-1829
Merge branch 'master' of git://git.apache.org/incubator-trafodion into TRAFODION-1829
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bf0ecdf6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bf0ecdf6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bf0ecdf6
Branch: refs/heads/master
Commit: bf0ecdf6a7daa356eff8fbd85d779b44420f5a21
Parents: 976fc38 760ba88
Author: venkat1m <ve...@esgyn.com>
Authored: Mon Mar 21 18:19:22 2016 +0000
Committer: venkat1m <ve...@esgyn.com>
Committed: Mon Mar 21 18:19:22 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/Makefile | 2 ++
core/conn/odbc/src/odbc/nsksrvrcore/csrvrstmt.cpp | 7 ++++++-
core/sqf/monitor/linux/config.cxx | 1 +
core/sqf/monitor/linux/makefile | 3 ++-
core/sqf/monitor/linux/monitor.cxx | 3 +++
core/sqf/src/seabed/src/sautil.cpp | 5 -----
core/sqf/src/seabed/src/stream.cpp | 2 --
7 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------