Merge remote-tracking branch 'origin/ignite-157-2' into ignite-157-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0810ed8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0810ed8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0810ed8 Branch: refs/heads/ignite-sprint-5 Commit: e0810ed828ab802e96cbccf65078b71faf674968 Parents: d14a0fb 2229d74 Author: sboikov <sboi...@gridgain.com> Authored: Tue Apr 28 09:17:24 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Apr 28 09:17:24 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/Ignition.java | 44 ++++ .../org/apache/ignite/internal/IgnitionEx.java | 165 +++++++++++++- .../processors/cache/CacheInvokeResult.java | 24 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheReturn.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../util/spring/IgniteSpringHelper.java | 54 ++++- .../DataStreamerMultiThreadedSelfTest.java | 19 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 32 +-- .../util/spring/IgniteSpringHelperImpl.java | 217 +++++++++++++++---- .../IgniteStartFromStreamConfigurationTest.java | 50 +++++ .../testsuites/IgniteSpringTestSuite.java | 2 + 15 files changed, 548 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
