Merge branch 'ignite-sprint-4' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/57ab09ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57ab09ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57ab09ee Branch: refs/heads/ignite-709_2 Commit: 57ab09ee168d70cbd65266944d263681c51a4f3c Parents: da3d9e7 54f9492 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue May 5 12:09:09 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue May 5 12:09: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 +- pom.xml | 39 +- 11 files changed, 389 insertions(+), 435 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57ab09ee/pom.xml ----------------------------------------------------------------------
