Merge branch 'master' into site
Project: http://git-wip-us.apache.org/repos/asf/incubator-tephra/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tephra/commit/9c70bee1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tephra/tree/9c70bee1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tephra/diff/9c70bee1 Branch: refs/heads/site Commit: 9c70bee1a2b97113c14233a747b109dd9fcb0e14 Parents: bf06a90 20bc046 Author: anew <a...@apache.org> Authored: Wed Sep 21 19:41:46 2016 -0700 Committer: anew <a...@apache.org> Committed: Wed Sep 21 19:41:46 2016 -0700 ---------------------------------------------------------------------- .../org/apache/tephra/TransactionContext.java | 31 ++++++++++++++++++++ .../java/org/apache/tephra/TxConstants.java | 12 -------- 2 files changed, 31 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
