You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/09 07:48:46 UTC
[13/18] ignite git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0122e48e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0122e48e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0122e48e
Branch: refs/heads/ignite-2753
Commit: 0122e48e2d6d84cf608883a6946f8eefff516d3b
Parents: fed76e9 9777198
Author: dkarachentsev <dk...@gridgain.com>
Authored: Tue Mar 1 15:19:37 2016 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Tue Mar 1 15:19:37 2016 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryClassDescriptor.java | 2 +-
.../processors/cache/CacheLazyEntry.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 20 +
.../processors/cache/GridCacheUtils.java | 15 +
.../cache/affinity/GridCacheAffinityImpl.java | 7 +-
.../processors/query/GridQueryProcessor.java | 13 +-
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../cache/VisorCacheAggregatedMetrics.java | 113 +-
.../internal/visor/cache/VisorCacheMetrics.java | 88 +-
.../cache/VisorCacheMetricsCollectorTask.java | 21 +-
.../visor/cache/VisorCacheMetricsV2.java | 66 +
.../internal/visor/cache/VisorCacheV2.java | 2 +-
.../ignite/resources/JobContextResource.java | 4 +-
.../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 | 473 +-
...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 | 104 +-
.../cache/CacheQueryNewClientSelfTest.java | 108 +
.../IgniteCacheQuerySelfTestSuite.java | 6 +-
.../commands/cache/VisorCacheCommand.scala | 30 +-
.../yardstick/IgniteBenchmarkArguments.java | 11 +
.../org/apache/ignite/yardstick/IgniteNode.java | 2 +
.../cache/IgniteCacheAbstractBenchmark.java | 54 +
54 files changed, 10425 insertions(+), 351 deletions(-)
----------------------------------------------------------------------