Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d39345b8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d39345b8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d39345b8 Branch: refs/heads/ignite-1.4 Commit: d39345b874097d8f6852b35c9d47c8037c13d19b Parents: c70680a cc0d1f5 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Mon Sep 14 18:55:54 2015 -0700 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Mon Sep 14 18:55:54 2015 -0700 ---------------------------------------------------------------------- .../org/apache/ignite/internal/GridKernalContext.java | 7 ++++--- .../org/apache/ignite/internal/GridKernalContextImpl.java | 10 +++++----- .../java/org/apache/ignite/internal/GridLoggerProxy.java | 6 ++++-- .../java/org/apache/ignite/internal/IgniteKernal.java | 6 +++--- .../ignite/internal/executor/GridExecutorService.java | 4 ++-- .../managers/deployment/GridDeploymentStoreAdapter.java | 4 ++-- .../internal/processors/cache/GridCacheAdapter.java | 4 ++-- .../processors/cache/GridCacheClearAllRunnable.java | 4 ++-- .../ignite/internal/processors/cache/GridCacheLogger.java | 4 ++-- .../internal/processors/cache/GridCacheSharedContext.java | 4 ++-- .../datastructures/GridCacheAtomicLongImpl.java | 4 ++-- .../datastructures/GridCacheAtomicReferenceImpl.java | 4 ++-- .../datastructures/GridCacheAtomicSequenceImpl.java | 4 ++-- .../datastructures/GridCacheAtomicStampedImpl.java | 4 ++-- .../datastructures/GridCacheCountDownLatchImpl.java | 4 ++-- .../internal/processors/igfs/IgfsFragmentizerManager.java | 8 +++++--- .../internal/processors/igfs/IgfsServerManager.java | 5 +++-- .../ignite/internal/processors/job/GridJobWorker.java | 4 ++-- .../ignite/internal/processors/task/GridTaskWorker.java | 4 ++-- 19 files changed, 50 insertions(+), 44 deletions(-) ----------------------------------------------------------------------