merge [TRAFODION-3165]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0d30493d Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0d30493d Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0d30493d Branch: refs/heads/master Commit: 0d30493de9bcbf1a7bb48cfaddd1e4723b8aca55 Parents: c8ffae3 4ac689a Author: Liu Ming <ovis_p...@sina.com> Authored: Mon Aug 6 19:27:09 2018 +0000 Committer: Liu Ming <ovis_p...@sina.com> Committed: Mon Aug 6 19:27:09 2018 +0000 ---------------------------------------------------------------------- .../hadoop/hbase/client/transactional/TransactionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------