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 2016/03/02 09:11:37 UTC
[18/19] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1232
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a51439f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a51439f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a51439f
Branch: refs/heads/ignite-1232
Commit: 3a51439f449fe720129c8f0333947d090e55731c
Parents: 0bf14f0 4e108ad
Author: sboikov <sb...@gridgain.com>
Authored: Wed Mar 2 11:02:42 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Mar 2 11:02:42 2016 +0300
----------------------------------------------------------------------
bin/ignite.bat | 7 +-
bin/ignite.sh | 6 +-
.../processors/cache/CacheLazyEntry.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 8 +
.../processors/cache/GridCacheUtils.java | 15 +
.../cache/affinity/GridCacheAffinityImpl.java | 7 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 +
.../ignite/spi/IgniteSpiConsistencyChecked.java | 8 +
.../ignite/spi/discovery/tcp/ClientImpl.java | 6 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../TcpDiscoveryMulticastIpFinder.java | 1 +
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +
.../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +
.../cache/CacheEntryProcessorCopySelfTest.java | 213 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 10 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 479 +-
...ridCacheSwapSpaceSpiConsistencySelfTest.java | 146 +
.../IgniteCacheConfigVariationsFullApiTest.java | 5851 ++++++++++++++++++
.../GridSwapSpaceSpiConsistencySelfTest.java | 131 +
.../configvariations/CacheStartMode.java | 29 +
.../configvariations/ConfigFactory.java | 39 +
.../configvariations/ConfigParameter.java | 34 +
.../configvariations/ConfigVariations.java | 346 ++
.../ConfigVariationsFactory.java | 197 +
.../ConfigVariationsTestSuiteBuilder.java | 382 ++
.../IgniteConfigVariationsTestSuite.java | 50 +
.../configvariations/Parameters.java | 377 ++
.../configvariations/VariationsIterator.java | 174 +
.../configvariations/VariationsTestsConfig.java | 161 +
.../testframework/junits/GridAbstractTest.java | 43 +-
...IgniteCacheConfigVariationsAbstractTest.java | 583 ++
.../IgniteConfigVariationsAbstractTest.java | 420 ++
.../ConfigVariationsTestSuiteBuilderTest.java | 112 +
.../testframework/test/ParametersTest.java | 87 +
.../test/VariationsIteratorTest.java | 156 +
.../ignite/testsuites/IgniteBasicTestSuite.java | 8 +
...heBasicConfigVariationsFullApiTestSuite.java | 41 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite5.java | 2 +
.../IgniteSpiSwapSpaceSelfTestSuite.java | 2 +
.../processors/query/h2/IgniteH2Indexing.java | 8 +
.../cache/CacheQueryNewClientSelfTest.java | 43 +-
.../Apache.Ignite.Core.Tests.csproj | 1 +
.../ProjectFilesTest.cs | 94 +
.../yardstick/IgniteBenchmarkArguments.java | 11 +
.../org/apache/ignite/yardstick/IgniteNode.java | 2 +
.../cache/IgniteCacheAbstractBenchmark.java | 54 +
modules/zookeeper/pom.xml | 50 +-
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 24 +-
49 files changed, 10196 insertions(+), 248 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a51439f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------