GitHub user JamesRTaylor opened a pull request: https://github.com/apache/phoenix/pull/300
Omid transaction support in Phoenix You can merge this pull request into a Git repository by running: $ git pull https://github.com/ohadshacham/phoenix 4.x-HBase-1.3-Omid-2 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/phoenix/pull/300.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #300 ---- commit 1039f9d4ca0da5185d8babaa6681459e07da61ad Author: Ohad Shacham <ohads@...> Date: 2018-04-03T14:03:55Z Add Omid support for Phoenix commit a11bddcacb90d553f6c0fdab37e2c335f7f23ac4 Author: Ohad Shacham <ohads@...> Date: 2018-05-02T11:55:47Z Merge remote-tracking branch 'upstream/4.x-HBase-1.3' into 4.x-HBase-1.3-Omid-2 commit 45e6b0e309d037c03221de249501fa7c4bc651db Author: Ohad Shacham <ohads@...> Date: 2018-05-08T07:16:19Z Remove hard coded Omid commit 18bea3907ef73c6f842ac5410ea4623be5a36b18 Author: Ohad Shacham <ohads@...> Date: 2018-05-08T09:28:05Z Merge remote-tracking branch 'upstream/4.x-HBase-1.3' into 4.x-HBase-1.3-Omid-2 commit 38ab6f459e6174e150d88a146b4a35d9c1857fb6 Author: Ohad Shacham <ohads@...> Date: 2018-05-15T08:19:05Z some merge fixes commit cbab9b72ee5c62d9512b9472b010f581e3866e21 Author: Ohad Shacham <ohads@...> Date: 2018-05-22T13:04:56Z Fix hbase config commit 7c834994a862f5e2a0edfa560c0a1c4f047383ca Author: Ohad Shacham <ohads@...> Date: 2018-05-22T18:30:01Z Partially revert the following commits. https://github.com/ohadshacham/phoenix/commit/45e6b0e309d037c03221de249501fa7c4bc651db https://github.com/ohadshacham/phoenix/commit/38ab6f459e6174e150d88a146b4a35d9c1857fb6 commit dc6de3ab12ad18e9dc5622521bfaf5a662e4d409 Author: Ohad Shacham <ohads@...> Date: 2018-05-22T18:32:35Z Merge commit '2015345a023f0adb59174443ec1328bb1399f11b' into 4.x-HBase-1.3-Omid-2 commit 9eae4abdbc770381620e23f4793acb279cec2544 Author: Ohad Shacham <ohads@...> Date: 2018-05-22T18:42:26Z Change back to TEPHRA what needed for testing TEPHRA commit 0c5dfd642b3738d2d09aa19f2e6d4cbb97852c20 Author: Ohad Shacham <ohads@...> Date: 2018-05-23T12:14:37Z remove unnecessary changes. ---- ---