Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/afa1daa5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/afa1daa5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/afa1daa5 Branch: refs/heads/master Commit: afa1daa5942329ce58870f4126021ad23865a8eb Parents: 86d7880 8110b8d Author: Anuradha Hegde <[email protected]> Authored: Mon May 16 19:58:02 2016 +0000 Committer: Anuradha Hegde <[email protected]> Committed: Mon May 16 19:58:02 2016 +0000 ---------------------------------------------------------------------- core/sql/executor/ExHbaseIUD.cpp | 3 +- core/sql/ustat/hs_globals.cpp | 120 +++++++++++++++++++++------------- core/sql/ustat/hs_globals.h | 4 ++ 3 files changed, 79 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
