Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e48c9c4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e48c9c4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e48c9c4 Branch: refs/heads/ignite-gg-10760 Commit: 6e48c9c4f8dca18300aaf168f764b7524e58851c Parents: 277b76d ae1e1dc Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Sep 15 16:39:27 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Sep 15 16:39:27 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxHandler.java | 2 +- .../ignite/internal/processors/igfs/IgfsAbstractSelfTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
