ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-151-154
Date Tue, 03 Feb 2015 09:48:27 GMT
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-151-154


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

Branch: refs/heads/ignite-151-154
Commit: 985726f3ba1d7204f076628457b9be281c254f9c
Parents: 27bb1f3 43e835b
Author: avinogradov <avinogradov@gridgain.com>
Authored: Tue Feb 3 12:44:49 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Tue Feb 3 12:44:49 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(-)
----------------------------------------------------------------------



Mime
View raw message