Merge remote-tracking branch 'upstream/omid'
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6f7d42f2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6f7d42f2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6f7d42f2 Branch: refs/heads/omid Commit: 6f7d42f23580f280aac4874ebe845775cf3a6d8c Parents: e34431c 6b16183 Author: Ohad Shacham <[email protected]> Authored: Thu Apr 13 12:10:53 2017 +0300 Committer: Ohad Shacham <[email protected]> Committed: Thu Apr 13 12:10:53 2017 +0300 ---------------------------------------------------------------------- .../transaction/OmidTransactionContext.java | 77 +++++ .../transaction/OmidTransactionTable.java | 323 +++++++++++++++++++ .../transaction/PhoenixTransactionContext.java | 83 +++++ .../transaction/PhoenixTransactionalTable.java | 133 ++++++++ .../transaction/TephraTransactionContext.java | 285 ++++++++++++++++ .../transaction/TephraTransactionTable.java | 303 +++++++++++++++++ 6 files changed, 1204 insertions(+) ----------------------------------------------------------------------
