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 667B1173A9 for ; Thu, 2 Apr 2015 01:56:13 +0000 (UTC) Received: (qmail 78824 invoked by uid 500); 2 Apr 2015 01:56:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 78792 invoked by uid 500); 2 Apr 2015 01:56:13 -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 78782 invoked by uid 99); 2 Apr 2015 01:56:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2015 01:56:13 +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; Thu, 02 Apr 2015 01:55:50 +0000 Received: (qmail 78198 invoked by uid 99); 2 Apr 2015 01:55:48 -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; Thu, 02 Apr 2015 01:55:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A38ABE2F2A; Thu, 2 Apr 2015 01:55:47 +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: Thu, 02 Apr 2015 01:56:01 -0000 Message-Id: <3ebaa7295abd48d5a6099442e23bd0e2@git.apache.org> In-Reply-To: <4600ec917c2a47ba9a6140c019dc7d7b@git.apache.org> References: <4600ec917c2a47ba9a6140c019dc7d7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/15] incubator-ignite git commit: Merge branches 'ignite-gg-9942' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9942 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-gg-9942' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9942 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d47b66a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d47b66a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d47b66a2 Branch: refs/heads/ignite-gg-9942 Commit: d47b66a2177367e3e86e1ffba9217589783d27d1 Parents: c8428a4 ed6632a Author: AKuznetsov Authored: Thu Apr 2 08:51:46 2015 +0700 Committer: AKuznetsov Committed: Thu Apr 2 08:51:46 2015 +0700 ---------------------------------------------------------------------- examples/pom.xml | 19 +- examples/schema-import/pom.xml | 10 +- modules/aop/pom.xml | 6 +- modules/aws/pom.xml | 4 +- modules/clients/pom.xml | 10 +- modules/codegen/pom.xml | 4 +- modules/core/pom.xml | 8 +- .../apache/ignite/cache/CachingProvider.java | 2 +- .../configuration/FileSystemConfiguration.java | 6 + .../processors/cache/CacheObjectContext.java | 14 +- .../processors/cache/CacheObjectImpl.java | 10 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../continuous/CacheContinuousQueryManager.java | 28 ++ .../IgniteCacheObjectProcessorImpl.java | 173 +++++++---- .../processors/igfs/IgfsDataManager.java | 11 +- .../processors/igfs/IgfsFileAffinityRange.java | 23 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +- .../IgniteCacheAtomicLocalStoreValueTest.java | 49 +++ ...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++ ...maryWriteOrderNearEnabledStoreValueTest.java | 31 ++ ...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 ++ .../cache/IgniteCacheAtomicStoreValueTest.java | 55 ++++ .../IgniteCacheStoreValueAbstractTest.java | 311 +++++++++++++++++++ .../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +++ .../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++ .../cache/IgniteCacheTxStoreValueTest.java | 49 +++ .../junits/common/GridCommonAbstractTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 9 + modules/extdata/p2p/pom.xml | 4 +- modules/extdata/uri/pom.xml | 4 +- modules/geospatial/pom.xml | 4 +- modules/hadoop/pom.xml | 8 +- modules/hibernate/pom.xml | 6 +- modules/indexing/pom.xml | 4 +- modules/jcl/pom.xml | 4 +- modules/jta/pom.xml | 4 +- modules/log4j/pom.xml | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 10 +- modules/schedule/pom.xml | 4 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 8 +- modules/ssh/pom.xml | 8 +- modules/urideploy/pom.xml | 6 +- modules/visor-console/pom.xml | 8 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 8 +- modules/yardstick/pom.xml | 6 +- pom.xml | 56 ++-- 52 files changed, 947 insertions(+), 221 deletions(-) ----------------------------------------------------------------------