ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [4/4] incubator-ignite git commit: Merge branches 'ignite-32' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Date Tue, 03 Feb 2015 09:17:09 GMT
Merge branches 'ignite-32' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-32


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

Branch: refs/heads/ignite-32
Commit: 52a250df62cdafacbb9dcce2b5c4a1399f9494a6
Parents: 4ac7ab9 98adbfa
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Feb 3 16:11:30 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Feb 3 16:11:30 2015 +0700

----------------------------------------------------------------------
 .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 +-
 .../config/benchmark-atomic-win.properties      |  9 +-
 .../config/benchmark-atomic.properties          |  9 +-
 .../config/benchmark-query-win.properties       |  5 +-
 .../yardstick/config/benchmark-query.properties |  5 +-
 .../config/benchmark-tx-win.properties          |  6 +-
 .../yardstick/config/benchmark-tx.properties    |  6 +-
 modules/yardstick/config/ignite-base-config.xml | 93 +++++++++++++++++++-
 .../cache/IgniteGetOffHeapBenchmark.java        | 32 +++++++
 .../cache/IgniteGetOffHeapValuesBenchmark.java  | 32 +++++++
 .../cache/IgnitePutGetOffHeapBenchmark.java     | 32 +++++++
 .../IgnitePutGetOffHeapValuesBenchmark.java     | 32 +++++++
 .../cache/IgnitePutGetTxOffHeapBenchmark.java   | 32 +++++++
 .../IgnitePutGetTxOffHeapValuesBenchmark.java   | 32 +++++++
 .../cache/IgnitePutOffHeapBenchmark.java        | 32 +++++++
 .../cache/IgnitePutOffHeapValuesBenchmark.java  | 32 +++++++
 .../cache/IgnitePutTxOffHeapBenchmark.java      | 32 +++++++
 .../IgnitePutTxOffHeapValuesBenchmark.java      | 32 +++++++
 .../IgniteSqlQueryJoinOffHeapBenchmark.java     | 32 +++++++
 .../cache/IgniteSqlQueryOffHeapBenchmark.java   | 32 +++++++
 .../IgniteSqlQueryPutOffHeapBenchmark.java      | 32 +++++++
 37 files changed, 587 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52a250df/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------


Mime
View raw message