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/ac4fa8f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ac4fa8f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ac4fa8f2 Branch: refs/heads/master Commit: ac4fa8f2c36ee5dc13726529d05f4113cb87f7be Parents: ad27625 e6ff37d Author: Amanda Moran <[email protected]> Authored: Tue Apr 19 00:07:22 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Tue Apr 19 00:07:22 2016 +0000 ---------------------------------------------------------------------- NOTICE | 2 +- core/sqf/sqenvcom.sh | 2 +- .../hadoop/hbase/regionserver/transactional/IdTmId.java | 10 ---------- win-odbc64/odbcclient/DSNConverter/DSNConverter.def | 2 +- win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 2 +- win-odbc64/odbcclient/TranslationDll/TranslationDll.def | 2 +- win-odbc64/odbcclient/TranslationDll/TranslationDll.rc | 2 +- win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 2 +- win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 2 +- win-odbc64/odbcclient/drvr35/drvr35.rc | 2 +- win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 2 +- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 2 +- 12 files changed, 11 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
