You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/02/02 22:57:17 UTC

[34/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-132

Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-132


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9afd27a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9afd27a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9afd27a5

Branch: refs/heads/ignite-132
Commit: 9afd27a5d74c755841cd33cd5060e5c4c2f92a3b
Parents: dadb9c5 43e835b
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Feb 3 00:31:17 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Feb 3 00:31:17 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(-)
----------------------------------------------------------------------