Merge branch 'ignite-sprint-4' into ignite-gg-10122
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6923a4d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6923a4d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6923a4d4 Branch: refs/heads/ignite-gg-10122 Commit: 6923a4d404c7b9d6df20f19836785fc8bf260b6d Parents: c98ad2d 54f9492 Author: vozerov-gridgain <[email protected]> Authored: Tue May 5 12:01:26 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue May 5 12:01:26 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 +- pom.xml | 39 +- 11 files changed, 389 insertions(+), 435 deletions(-) ----------------------------------------------------------------------
