You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/15 12:06:26 UTC
[05/31] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-836_2
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-836_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/e040b540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e040b540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e040b540
Branch: refs/heads/ignite-709_2
Commit: e040b5403733d053db16d87c10fcfbb5ace5dd86
Parents: f382ebc 5f8f6f4
Author: sevdokimov <se...@gridgain.com>
Authored: Tue May 5 16:46:09 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue May 5 16:46:09 2015 +0300
----------------------------------------------------------------------
.../streaming/wordcount/CacheConfig.java | 5 -
.../config/grid-client-config.properties | 50 +-
.../ClientPropertiesConfigurationSelfTest.java | 12 +-
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../org/apache/ignite/IgniteJdbcDriver.java | 81 ++-
.../ignite/compute/ComputeTaskAdapter.java | 14 +-
.../client/GridClientConfiguration.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 503 +++++++++----------
.../processors/cache/GridCacheProcessor.java | 109 ++--
.../apache/ignite/lang/IgniteAsyncSupport.java | 4 +-
.../cache/GridCacheSwapReloadSelfTest.java | 20 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 15 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 2 +-
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +-
.../cache/GridCacheOffHeapSelfTest.java | 11 +-
pom.xml | 39 +-
17 files changed, 438 insertions(+), 449 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e040b540/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------