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/07/25 16:28:11 UTC

[2/4] 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/dee8448b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dee8448b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dee8448b

Branch: refs/heads/master
Commit: dee8448b14c38e2a97c6c538a958cec1824bb421
Parents: d049046 63b0628
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Fri Jul 22 18:16:46 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Fri Jul 22 18:16:46 2016 +0000

----------------------------------------------------------------------
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp               | 2 +-
 core/sqf/sql/scripts/sqcheck                                  | 2 +-
 core/sql/executor/ex_root.cpp                                 | 6 +-----
 docs/jdbct4ref_guide/src/asciidoc/_chapters/introduction.adoc | 2 +-
 docs/load_transform/src/asciidoc/index.adoc                   | 1 +
 docs/messages_guide/src/asciidoc/_chapters/introduction.adoc  | 2 +-
 docs/odb_user/src/asciidoc/_chapters/about.adoc               | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------