Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7b2d721 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7b2d721 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7b2d721 Branch: refs/heads/ignite-nio Commit: a7b2d7218b9c1f5b8b4fee3af1858dab347ed3fe Parents: f1e453c 19fd04d Author: AKuznetsov <akuznet...@gridgain.com> Authored: Sat Feb 14 17:47:13 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Sat Feb 14 17:47:13 2015 +0700 ---------------------------------------------------------------------- examples/pom-standalone.xml | 6 ++++++ examples/pom.xml | 6 ++++++ .../src/main/java/org/apache/ignite/IgniteCache.java | 2 +- .../main/java/org/apache/ignite/cache/CacheManager.java | 4 ++-- .../ignite/cache/store/jdbc/CacheAbstractJdbcStore.java | 3 ++- .../apache/ignite/configuration/CacheConfiguration.java | 4 ++-- .../processors/cache/GridCacheConcurrentMap.java | 7 ++++--- .../internal/processors/cache/GridCacheEntrySet.java | 3 ++- .../cache/affinity/GridCacheAffinityProxy.java | 2 +- .../rest/handlers/cache/GridCacheCommandHandler.java | 2 +- .../handlers/cache/GridCacheQueryCommandHandler.java | 6 +++--- .../org/apache/ignite/startup/BasicWarmupClosure.java | 3 ++- modules/extdata/p2p/pom.xml | 6 ++++++ modules/hadoop/pom.xml | 12 ++++++++++++ modules/hibernate/pom.xml | 6 ++++++ modules/indexing/pom.xml | 12 ++++++++++++ modules/jta/pom.xml | 6 ++++++ modules/scalar/pom.xml | 6 ++++++ modules/spring/pom.xml | 6 ++++++ 19 files changed, 86 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
