ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [8/8] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-497-stick
Date Tue, 24 Mar 2015 14:05:31 GMT
Merge branch 'sprint-2' into ignite-497-stick


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

Branch: refs/heads/ignite-497
Commit: 966c9b93f5351b7795f887050b3dd3be90519ee1
Parents: 23169f7 0d30a61
Author: nikolay tikhonov <ntikhonov@gridgain.com>
Authored: Tue Mar 24 17:01:57 2015 +0300
Committer: nikolay tikhonov <ntikhonov@gridgain.com>
Committed: Tue Mar 24 17:01:57 2015 +0300

----------------------------------------------------------------------
 .../src/test/resources/spring-server-node.xml   |   4 +-
 .../test/resources/spring-server-ssl-node.xml   |   4 +-
 .../processors/cache/GridCacheStoreManager.java |  63 +++++++--
 .../cache/GridCacheWriteBehindStore.java        |  36 +++---
 .../ignite/internal/processors/igfs/IgfsEx.java |   3 +
 .../visor/node/VisorIgfsConfiguration.java      |  11 ++
 .../apache/ignite/transactions/Transaction.java |   1 -
 .../spring-cache-client-benchmark-1.xml         |   4 +-
 .../spring-cache-client-benchmark-2.xml         |   4 +-
 .../spring-cache-client-benchmark-3.xml         |   4 +-
 .../core/src/test/config/discovery-stress.xml   |   1 -
 .../src/test/config/load/cache-benchmark.xml    |   2 -
 .../config/load/dsi-49-server-production.xml    |   2 -
 .../src/test/config/load/dsi-load-server.xml    |   5 +-
 ...cheNearUpdateTopologyChangeAbstractTest.java | 129 +++++++++++++++++++
 ...CacheAtomicNearUpdateTopologyChangeTest.java |  39 ++++++
 .../CacheTxNearUpdateTopologyChangeTest.java    |  33 +++++
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   8 --
 .../dht/GridCacheDhtEvictionSelfTest.java       |   8 --
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |   8 --
 .../capacity/spring-capacity-cache.xml          |   2 -
 .../loadtests/colocation/spring-colocation.xml  |   2 -
 .../testframework/junits/GridAbstractTest.java  |   8 ++
 .../junits/common/GridCommonAbstractTest.java   |  53 ++++++++
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  26 +++-
 .../hadoop/fs/v1/IgniteHadoopFileSystem.java    |   4 +-
 .../hadoop/fs/v2/IgniteHadoopFileSystem.java    |   4 +-
 .../internal/processors/hadoop/HadoopSetup.java |   8 +-
 .../hadoop/SecondaryFileSystemProvider.java     |  31 +++--
 ...oopSecondaryFileSystemConfigurationTest.java |   4 +-
 .../ignite/schema/generator/CodeGenerator.java  | 111 ++++++++++++++--
 .../ignite/schema/generator/XmlGenerator.java   |  12 +-
 .../apache/ignite/schema/model/IndexItem.java   |  16 +--
 .../ignite/schema/model/PojoDescriptor.java     |  16 ++-
 .../ignite/schema/ui/ConfirmCallable.java       |   2 +-
 .../org/apache/ignite/schema/ui/MessageBox.java |  21 +--
 36 files changed, 554 insertions(+), 135 deletions(-)
----------------------------------------------------------------------



Mime
View raw message