Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/415264e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/415264e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/415264e3 Branch: refs/heads/master Commit: 415264e3e59d98e711fe37d7e4c12ef2416d9e7d Parents: 03dc03d e0e1994 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Jun 19 11:32:38 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Jun 19 11:32:38 2015 -0700 ---------------------------------------------------------------------- .../cache/GridCachePartitionExchangeManager.java | 1 + .../processors/cache/jta/GridCacheXAResource.java | 18 +++++++++--------- .../processors/cache/GridCacheJtaSelfTest.java | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
