Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/58b6ceb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/58b6ceb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/58b6ceb2 Branch: refs/heads/ignite-639 Commit: 58b6ceb2722f2738f772cf373f98dc7d6901adf2 Parents: 238e124 214a461 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Apr 2 18:00:33 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Apr 2 18:00:33 2015 +0700 ---------------------------------------------------------------------- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../processors/igfs/IgsfStartCacheTest.java | 115 +++++++++++++++++++ 2 files changed, 117 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
