Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7395710929 for ; Tue, 3 Feb 2015 02:05:47 +0000 (UTC) Received: (qmail 53957 invoked by uid 500); 3 Feb 2015 02:05:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 53877 invoked by uid 500); 3 Feb 2015 02:05:42 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 53813 invoked by uid 99); 3 Feb 2015 02:05:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2015 02:05:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 03 Feb 2015 02:05:40 +0000 Received: (qmail 52443 invoked by uid 99); 3 Feb 2015 02:05:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2015 02:05:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6C4FE0504; Tue, 3 Feb 2015 02:05:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 03 Feb 2015 02:05:52 -0000 Message-Id: <79eeaa47705342ed8db992dd62c9e539@git.apache.org> In-Reply-To: <662bb9db6434428a96c318ad92db97c5@git.apache.org> References: <662bb9db6434428a96c318ad92db97c5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/44] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-86' into sprint-1 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-86' 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/88514f70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88514f70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88514f70 Branch: refs/heads/ignite-82 Commit: 88514f70095e2b21415d24cec10ec79896d016d4 Parents: 7f50e80 258ee1c Author: ivasilinets Authored: Mon Feb 2 12:30:33 2015 +0300 Committer: ivasilinets Committed: Mon Feb 2 12:30:33 2015 +0300 ---------------------------------------------------------------------- .../GridDeploymentPerLoaderStore.java | 20 ++- .../GridDeploymentPerVersionStore.java | 4 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheDeploymentManager.java | 161 +++++++++++-------- .../cache/GridCachePreloaderAdapter.java | 2 +- .../processors/cache/GridCacheProcessor.java | 5 +- .../processors/cache/GridCacheSwapManager.java | 3 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../streamer/GridStreamProcessor.java | 5 +- .../processors/streamer/IgniteStreamerEx.java | 3 +- .../processors/streamer/IgniteStreamerImpl.java | 5 +- 11 files changed, 113 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88514f70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88514f70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88514f70/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java ----------------------------------------------------------------------