Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/876430d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/876430d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/876430d2 Branch: refs/heads/ignite-286 Commit: 876430d22e6d826be7a09a45c2232ab53b15f025 Parents: b2ddfe5 bd3a572 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Apr 28 09:24:44 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Apr 28 09:24:44 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 +- .../top/GridTopologyCommandHandler.java | 3 +- .../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 + 16 files changed, 550 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/876430d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------
