You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/02/03 07:17:52 UTC
[3/3] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/sprint-1' into ignite-26
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 <sb...@gridgain.com>
Authored: Tue Feb 3 09:15:16 2015 +0300
Committer: sboikov <sb...@gridgain.com>
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
----------------------------------------------------------------------