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 9380717209 for ; Tue, 3 Feb 2015 06:20:40 +0000 (UTC) Received: (qmail 91114 invoked by uid 500); 3 Feb 2015 06:20:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 91081 invoked by uid 500); 3 Feb 2015 06:20:41 -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 91072 invoked by uid 99); 3 Feb 2015 06:20:41 -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 06:20:41 +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 06:20:40 +0000 Received: (qmail 84512 invoked by uid 99); 3 Feb 2015 06:17:50 -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 06:17:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1BB2AE0504; Tue, 3 Feb 2015 06:17:50 +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: Tue, 03 Feb 2015 06:17:52 -0000 Message-Id: <6747bced4afb454ab71ba26da8a3feab@git.apache.org> In-Reply-To: <100843ded8584462bbc7cf2c9f5582c8@git.apache.org> References: <100843ded8584462bbc7cf2c9f5582c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-26 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-26 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fee13d9a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fee13d9a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fee13d9a Branch: refs/heads/ignite-26 Commit: fee13d9a31e641ac71f10075c05950d7bdb2e0cb Parents: 76316fe 43e835b Author: sboikov Authored: Tue Feb 3 09:15:16 2015 +0300 Committer: sboikov Committed: Tue Feb 3 09:15:16 2015 +0300 ---------------------------------------------------------------------- .gitignore | 1 - config/fabric/default-config.xml | 2 +- config/ignite-log4j.xml | 27 +++----------------- config/java.util.logging.properties | 6 ++--- ipc/shmem/readme.txt | 2 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- modules/clients/src/test/resources/log4j.xml | 2 +- .../apache/ignite/IgniteBasicWarmupClosure.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 24 ++++++++--------- .../org/apache/ignite/cache/CacheEntry.java | 2 +- .../apache/ignite/cache/CacheProjection.java | 10 ++++---- .../cache/CacheWriteSynchronizationMode.java | 10 ++++---- .../configuration/IgniteConfiguration.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 4 +-- .../main/java/org/apache/ignite/package.html | 2 +- modules/core/src/test/config/example-cache.xml | 8 +++--- modules/core/src/test/config/ggfs-loopback.xml | 8 +++--- 17 files changed, 47 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fee13d9a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fee13d9a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fee13d9a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ----------------------------------------------------------------------