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 B45E317DFE for ; Mon, 6 Apr 2015 07:30:25 +0000 (UTC) Received: (qmail 99594 invoked by uid 500); 6 Apr 2015 07:30:25 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 99568 invoked by uid 500); 6 Apr 2015 07:30:25 -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 99559 invoked by uid 99); 6 Apr 2015 07:30:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 07:30:25 +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; Mon, 06 Apr 2015 07:30:24 +0000 Received: (qmail 99206 invoked by uid 99); 6 Apr 2015 07:30:04 -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; Mon, 06 Apr 2015 07:30:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C566AE10A7; Mon, 6 Apr 2015 07:30:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 06 Apr 2015 07:30:20 -0000 Message-Id: <77b0bebdf0ff45459a73869d56de36a9@git.apache.org> In-Reply-To: <66a19487d6ae44e591b369602533bb44@git.apache.org> References: <66a19487d6ae44e591b369602533bb44@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/21] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-668' into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-668' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cad2ab38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cad2ab38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cad2ab38 Branch: refs/heads/ignite-560 Commit: cad2ab38051171499023a8f716f670a6f2144bf3 Parents: 5b806d8 223a9cd Author: sboikov Authored: Mon Apr 6 09:11:26 2015 +0300 Committer: sboikov Committed: Mon Apr 6 09:11:26 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheType.java | 77 +++++++++ .../cache/DynamicCacheChangeRequest.java | 17 ++ .../cache/DynamicCacheDescriptor.java | 15 +- .../processors/cache/GridCacheAdapter.java | 6 +- .../processors/cache/GridCacheContext.java | 26 ++- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/cache/GridCacheProcessor.java | 133 +++++++++++----- .../cache/GridCacheSharedContext.java | 4 +- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../near/GridNearTransactionalCache.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 19 ++- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 8 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--- .../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++ .../IgniteCacheSystemTransactionsSelfTest.java | 3 +- .../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++++ .../processors/igfs/IgsfStartCacheTest.java | 115 -------------- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + 23 files changed, 592 insertions(+), 216 deletions(-) ----------------------------------------------------------------------