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/d7f4097f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7f4097f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7f4097f Branch: refs/heads/ignite-sql-old Commit: d7f4097f3f21794e3833fbf7eb8b5f4155a0b547 Parents: 4ff6cb4 9ddc981 Author: anovikov <anovi...@gridgain.com> Authored: Sat Feb 14 17:22:58 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Sat Feb 14 17:22:58 2015 +0700 ---------------------------------------------------------------------- modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 2 +- .../src/main/java/org/apache/ignite/cache/CacheManager.java | 4 ++-- .../ignite/cache/store/jdbc/CacheAbstractJdbcStore.java | 3 ++- .../org/apache/ignite/configuration/CacheConfiguration.java | 4 ++-- .../internal/processors/cache/GridCacheConcurrentMap.java | 7 ++++--- .../ignite/internal/processors/cache/GridCacheEntrySet.java | 3 ++- .../processors/cache/affinity/GridCacheAffinityProxy.java | 2 +- .../rest/handlers/cache/GridCacheCommandHandler.java | 2 +- .../rest/handlers/cache/GridCacheQueryCommandHandler.java | 6 +++--- .../java/org/apache/ignite/startup/BasicWarmupClosure.java | 3 ++- 10 files changed, 20 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
