Merge remote-tracking branch 'remotes/origin/master' into ignite-6467 # Conflicts: # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a867641d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a867641d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a867641d Branch: refs/heads/ignite-6467 Commit: a867641de74c8981a3616a2198255ddad06210ef Parents: 1775991 2f17709 Author: sboikov <sboi...@gridgain.com> Authored: Sat Jul 28 10:09:14 2018 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Sat Jul 28 10:09:14 2018 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 2 +- docker/apache-ignite/Dockerfile | 9 + docker/apache-ignite/run.sh | 2 +- docker/web-agent/Dockerfile | 3 +- .../OptimizeMakeChangeFitnessFunction.java | 1 - .../change/OptimizeMakeChangeGAExample.java | 2 - .../OptimizeMakeChangeTerminateCriteria.java | 2 - .../genetic/helloworld/HelloWorldGAExample.java | 2 - .../helloworld/HelloWorldTerminateCriteria.java | 2 - .../ml/genetic/knapsack/KnapsackGAExample.java | 2 - .../knapsack/KnapsackTerminateCriteria.java | 1 - .../ml/genetic/movie/MovieFitnessFunction.java | 1 - .../ml/genetic/movie/MovieGAExample.java | 2 - .../genetic/movie/MovieTerminateCriteria.java | 2 - .../ml/knn/KNNClassificationExample.java | 2 +- .../examples/ml/knn/KNNRegressionExample.java | 2 +- .../examples/ml/nn/MLPTrainerExample.java | 2 +- .../ml/preprocessing/BinarizationExample.java | 2 +- .../ml/preprocessing/ImputingExample.java | 2 +- .../ImputingExampleWithMostFrequentValues.java | 2 +- .../ml/preprocessing/MinMaxScalerExample.java | 2 +- .../ml/preprocessing/NormalizationExample.java | 2 +- ...ssionLSQRTrainerWithMinMaxScalerExample.java | 2 +- ...gressionMultiClassClassificationExample.java | 2 +- .../SVMMultiClassClassificationExample.java | 2 +- .../RandomForestRegressionExample.java | 18 +- .../ml/tutorial/Step_1_Read_and_Learn.java | 2 +- .../examples/ml/tutorial/Step_2_Imputing.java | 2 +- .../examples/ml/tutorial/Step_3_Categorial.java | 2 +- .../ml/tutorial/Step_4_Add_age_fare.java | 2 +- .../examples/ml/tutorial/Step_5_Scaling.java | 2 +- .../ignite/examples/ml/tutorial/Step_6_KNN.java | 2 +- .../ml/tutorial/Step_7_Split_train_test.java | 2 +- .../ignite/examples/ml/tutorial/Step_8_CV.java | 2 +- .../ml/tutorial/Step_8_CV_with_Param_Grid.java | 173 ++ .../ml/tutorial/Step_9_Go_to_LogReg.java | 2 +- modules/cassandra/store/pom.xml | 2 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../java/org/apache/ignite/IgniteCluster.java | 7 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../rendezvous/RendezvousAffinityFunction.java | 6 + .../configuration/BasicAddressResolver.java | 9 + .../configuration/ConnectorConfiguration.java | 8 + .../configuration/DataStorageConfiguration.java | 2 + .../configuration/HadoopConfiguration.java | 4 +- .../configuration/MemoryConfiguration.java | 6 + .../MemoryPolicyConfiguration.java | 6 + .../configuration/TransactionConfiguration.java | 6 + .../ignite/internal/GridKernalContext.java | 7 + .../ignite/internal/GridKernalContextImpl.java | 14 +- .../apache/ignite/internal/IgniteKernal.java | 4 + .../org/apache/ignite/internal/IgnitionEx.java | 13 +- .../ignite/internal/LongJVMPauseDetector.java | 9 + .../internal/binary/BinaryMarshaller.java | 8 + .../cluster/IgniteClusterAsyncImpl.java | 5 + .../internal/cluster/IgniteClusterImpl.java | 15 + .../optimized/OptimizedMarshaller.java | 8 +- .../internal/pagemem/wal/record/DataEntry.java | 12 + .../pagemem/wal/record/LazyDataEntry.java | 3 + .../cache/CacheClusterMetricsMXBeanImpl.java | 7 +- .../cache/CacheJoinNodeDiscoveryData.java | 26 +- .../cache/CacheStatisticsClearMessage.java | 125 ++ .../cache/GatewayProtectedCacheProxy.java | 12 + .../processors/cache/GridCacheProcessor.java | 128 +- .../processors/cache/IgniteCacheProxyImpl.java | 10 + .../CacheDataStructuresManager.java | 27 +- .../GridDistributedTxRemoteAdapter.java | 44 +- .../dht/GridDhtTransactionalCacheAdapter.java | 176 +- ...arOptimisticSerializableTxPrepareFuture.java | 4 - .../near/GridNearOptimisticTxPrepareFuture.java | 12 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 39 + .../GridNearPessimisticTxPrepareFuture.java | 5 + .../cache/distributed/near/GridNearTxLocal.java | 25 +- .../near/GridNearTxPrepareFutureAdapter.java | 5 + .../wal/reader/StandaloneGridKernalContext.java | 5 + .../wal/serializer/RecordDataV1Serializer.java | 4 + .../cache/transactions/IgniteTxManager.java | 11 +- .../datastructures/DataStructuresProcessor.java | 55 +- .../datastructures/GridCacheSetHeader.java | 31 +- .../datastructures/GridCacheSetImpl.java | 134 +- .../datastructures/GridCacheSetItemKey.java | 5 +- .../datastructures/GridCacheSetProxy.java | 18 + .../internal/processors/query/QueryUtils.java | 3 + .../ignite/internal/util/IgniteUtils.java | 16 + .../util/nio/GridNioMetricsListener.java | 6 +- .../util/nio/GridNioServerListener.java | 5 +- .../communication/CommunicationListener.java | 5 +- .../communication/tcp/TcpCommunicationSpi.java | 38 +- .../spi/deployment/DeploymentListener.java | 6 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 31 +- .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 2 +- .../ignite/startup/BasicWarmupClosure.java | 10 +- .../resources/META-INF/classnames.properties | 1 + .../cache/CacheGetEntryAbstractTest.java | 2 +- .../cache/CacheMetricsEnableRuntimeTest.java | 403 ---- .../cache/CacheMetricsManageTest.java | 542 +++++ ...CacheFullTextQueryMultithreadedSelfTest.java | 11 +- .../GridCacheSetAbstractSelfTest.java | 50 +- .../IgniteCollectionAbstractTest.java | 11 + .../IgniteDataStructureWithJobTest.java | 10 +- .../distributed/CacheExchangeMergeTest.java | 5 +- .../CacheLateAffinityAssignmentTest.java | 2 - ...niteCacheClientNodeChangingTopologyTest.java | 95 + ...gniteAtomicLongChangingTopologySelfTest.java | 18 + ...ReplicatedFullApiMultithreadedSelfTest1.java | 1980 ------------------ ...PdsAtomicCacheHistoricalRebalancingTest.java | 5 + .../IgnitePdsCacheRebalancingAbstractTest.java | 179 +- .../IgnitePdsTxCacheRebalancingTest.java | 1 - .../IgnitePdsTxHistoricalRebalancingTest.java | 64 + .../AbstractNodeJoinTemplate.java | 8 +- ...ollbackOnTimeoutNoDeadlockDetectionTest.java | 4 - .../transactions/TxRollbackOnTimeoutTest.java | 19 +- .../internal/util/IgniteUtilsSelfTest.java | 29 + .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 4 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../multijvm/IgniteCacheProcessProxy.java | 5 + .../multijvm/IgniteClusterProcessProxy.java | 5 + .../IgniteCacheMetricsSelfTestSuite.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 2 + modules/indexing/pom.xml | 7 + .../processors/query/h2/IgniteH2Indexing.java | 85 +- .../query/h2/ddl/DdlStatementsProcessor.java | 28 +- .../query/h2/dml/UpdatePlanBuilder.java | 15 +- .../query/h2/sql/GridSqlQuerySplitter.java | 12 +- .../processors/query/h2/sys/SqlSystemIndex.java | 143 ++ .../processors/query/h2/sys/SqlSystemTable.java | 208 ++ .../query/h2/sys/SqlSystemTableEngine.java | 60 + .../h2/sys/view/SqlAbstractLocalSystemView.java | 104 + .../h2/sys/view/SqlAbstractSystemView.java | 134 ++ .../query/h2/sys/view/SqlSystemView.java | 79 + .../sys/view/SqlSystemViewColumnCondition.java | 102 + .../query/h2/sys/view/SqlSystemViewNodes.java | 116 + .../query/SqlSystemViewsSelfTest.java | 247 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../IgnitePdsWithIndexingCoreTestSuite.java | 9 +- .../main/java/org/apache/ignite/ml/Model.java | 7 + .../ml/clustering/kmeans/KMeansModel.java | 22 +- .../ml/clustering/kmeans/KMeansModelFormat.java | 2 +- .../ml/clustering/kmeans/KMeansTrainer.java | 6 +- .../ml/composition/BaggingModelTrainer.java | 38 +- .../ml/composition/ModelOnFeaturesSubspace.java | 19 + .../ml/composition/ModelsComposition.java | 14 + .../boosting/GDBBinaryClassifierTrainer.java | 2 +- .../boosting/GDBRegressionTrainer.java | 2 +- .../ml/composition/boosting/GDBTrainer.java | 40 +- .../PredictionsAggregator.java | 8 + .../WeightedPredictionsAggregator.java | 24 + .../ignite/ml/dataset/DatasetFactory.java | 2 +- .../dataset/impl/cache/CacheBasedDataset.java | 3 +- .../builder/data/SimpleDatasetDataBuilder.java | 2 +- .../data/SimpleLabeledDatasetDataBuilder.java | 2 +- .../ml/environment/LearningEnvironment.java | 54 + .../environment/LearningEnvironmentBuilder.java | 123 ++ .../ml/environment/logging/ConsoleLogger.java | 102 + .../ml/environment/logging/CustomMLLogger.java | 105 + .../ignite/ml/environment/logging/MLLogger.java | 69 + .../ml/environment/logging/NoOpLogger.java | 64 + .../ml/environment/logging/package-info.java | 21 + .../ignite/ml/environment/package-info.java | 21 + .../parallelism/DefaultParallelismStrategy.java | 85 + .../parallelism/NoParallelismStrategy.java | 87 + .../parallelism/ParallelismStrategy.java | 47 + .../ml/environment/parallelism/Promise.java | 53 + .../environment/parallelism/package-info.java | 21 + .../apache/ignite/ml/genetic/CrossOverJob.java | 4 +- .../apache/ignite/ml/genetic/CrossOverTask.java | 4 +- .../apache/ignite/ml/genetic/FitnessJob.java | 4 +- .../apache/ignite/ml/genetic/FitnessTask.java | 4 +- .../org/apache/ignite/ml/genetic/GAGrid.java | 3 - .../java/org/apache/ignite/ml/genetic/Gene.java | 1 - .../apache/ignite/ml/genetic/MutateTask.java | 5 +- .../ignite/ml/genetic/TruncateSelectionJob.java | 3 +- .../ml/genetic/TruncateSelectionTask.java | 4 +- .../ml/genetic/functions/GAGridFunction.java | 4 +- .../ml/genetic/parameter/GAConfiguration.java | 1 - .../ignite/ml/genetic/utils/GAGridUtils.java | 3 - .../java/org/apache/ignite/ml/knn/KNNUtils.java | 2 +- .../classification/KNNClassificationModel.java | 17 +- .../KNNClassificationTrainer.java | 4 +- .../ml/knn/regression/KNNRegressionModel.java | 17 +- .../ml/knn/regression/KNNRegressionTrainer.java | 4 +- .../java/org/apache/ignite/ml/math/Blas.java | 2 +- .../java/org/apache/ignite/ml/math/Tracer.java | 32 +- .../ml/math/distances/DistanceMeasure.java | 2 +- .../ml/math/distances/EuclideanDistance.java | 2 +- .../ml/math/distances/HammingDistance.java | 2 +- .../ml/math/distances/ManhattanDistance.java | 2 +- .../math/primitives/matrix/AbstractMatrix.java | 2 +- .../primitives/matrix/impl/DenseMatrix.java | 6 +- .../primitives/matrix/impl/SparseMatrix.java | 6 +- .../math/primitives/matrix/impl/ViewMatrix.java | 6 +- .../matrix/storage/DenseMatrixStorage.java | 2 +- .../matrix/storage/SparseMatrixStorage.java | 2 +- .../math/primitives/vector/AbstractVector.java | 2 +- .../ml/math/primitives/vector/Vector.java | 3 +- .../vector/impl/DelegatingVector.java | 6 +- .../primitives/vector/impl/DenseVector.java | 6 +- .../primitives/vector/impl/SparseVector.java | 4 +- .../math/primitives/vector/impl/VectorView.java | 4 +- .../vector/impl/VectorizedViewMatrix.java | 4 +- .../storage/VectorizedViewMatrixStorage.java | 2 +- .../apache/ignite/ml/math/util/MatrixUtil.java | 6 +- .../org/apache/ignite/ml/nn/MLPTrainer.java | 6 +- .../ignite/ml/nn/MultilayerPerceptron.java | 29 +- .../ignite/ml/nn/ReplicatedVectorMatrix.java | 6 +- .../ignite/ml/optimization/LossFunctions.java | 2 +- .../ml/optimization/SmoothParametrized.java | 4 +- .../NesterovUpdateCalculator.java | 4 +- .../ParameterUpdateCalculator.java | 4 +- .../RPropUpdateCalculator.java | 4 +- .../SimpleGDUpdateCalculator.java | 4 +- .../binarization/BinarizationPreprocessor.java | 2 +- .../binarization/BinarizationTrainer.java | 2 +- .../StringEncoderPreprocessor.java | 4 +- .../stringencoder/StringEncoderTrainer.java | 2 +- .../imputing/ImputerPreprocessor.java | 2 +- .../preprocessing/imputing/ImputerTrainer.java | 2 +- .../minmaxscaling/MinMaxScalerPreprocessor.java | 2 +- .../minmaxscaling/MinMaxScalerTrainer.java | 2 +- .../NormalizationPreprocessor.java | 2 +- .../normalization/NormalizationTrainer.java | 2 +- .../linear/FeatureExtractorWrapper.java | 2 +- .../linear/LinearRegressionLSQRTrainer.java | 6 +- .../linear/LinearRegressionModel.java | 9 +- .../linear/LinearRegressionSGDTrainer.java | 4 +- .../binomial/LogisticRegressionModel.java | 9 +- .../binomial/LogisticRegressionSGDTrainer.java | 4 +- .../LogRegressionMultiClassModel.java | 5 + .../LogRegressionMultiClassTrainer.java | 4 +- .../ignite/ml/selection/cv/CrossValidation.java | 214 +- .../ml/selection/cv/CrossValidationResult.java | 134 ++ .../ml/selection/paramgrid/ParamGrid.java | 58 + .../paramgrid/ParameterSetGenerator.java | 91 + .../ml/selection/paramgrid/package-info.java | 22 + .../cursor/CacheBasedLabelPairCursor.java | 2 +- .../scoring/cursor/LocalLabelPairCursor.java | 2 +- .../selection/scoring/evaluator/Evaluator.java | 2 +- .../ignite/ml/structures/LabeledDataset.java | 2 +- ...abeledDatasetPartitionDataBuilderOnHeap.java | 2 +- .../preprocessing/LabeledDatasetLoader.java | 2 +- .../svm/SVMLinearBinaryClassificationModel.java | 9 +- .../SVMLinearBinaryClassificationTrainer.java | 4 +- .../SVMLinearMultiClassClassificationModel.java | 5 + ...VMLinearMultiClassClassificationTrainer.java | 4 +- .../ignite/ml/trainers/DatasetTrainer.java | 26 +- .../ml/trainers/MultiLabelDatasetTrainer.java | 2 +- .../ml/trainers/SingleLabelDatasetTrainer.java | 2 +- .../org/apache/ignite/ml/tree/DecisionTree.java | 62 +- .../tree/DecisionTreeClassificationTrainer.java | 38 + .../ml/tree/DecisionTreeConditionalNode.java | 10 + .../ignite/ml/tree/DecisionTreeLeafNode.java | 10 + .../ml/tree/data/DecisionTreeDataBuilder.java | 2 +- .../org/apache/ignite/ml/util/ModelTrace.java | 130 ++ .../org/apache/ignite/ml/LocalModelsTest.java | 2 +- .../java/org/apache/ignite/ml/TestUtils.java | 2 +- .../ignite/ml/clustering/KMeansModelTest.java | 2 +- .../ignite/ml/clustering/KMeansTrainerTest.java | 2 +- .../ml/genetic/GAGridCalculateFitnessTest.java | 5 +- .../genetic/GAGridInitializePopulationTest.java | 5 +- .../ignite/ml/knn/KNNClassificationTest.java | 2 +- .../apache/ignite/ml/knn/KNNRegressionTest.java | 2 +- .../ignite/ml/knn/LabeledDatasetTest.java | 2 +- .../org/apache/ignite/ml/math/BlasTest.java | 2 +- .../ignite/ml/math/MathImplLocalTestSuite.java | 8 +- .../org/apache/ignite/ml/math/TracerTest.java | 2 +- .../matrix/MatrixBaseStorageTest.java | 1 - .../matrix/MatrixStorageFixtures.java | 1 - .../primitives/vector/AbstractVectorTest.java | 2 +- .../vector/DelegatingVectorConstructorTest.java | 2 +- .../primitives/vector/MatrixVectorViewTest.java | 2 +- .../primitives/vector/VectorAttributesTest.java | 2 +- .../vector/VectorBaseStorageTest.java | 1 - .../vector/VectorImplementationsFixtures.java | 4 +- .../vector/VectorImplementationsTest.java | 2 +- .../primitives/vector/VectorToMatrixTest.java | 4 +- .../java/org/apache/ignite/ml/nn/MLPTest.java | 4 +- .../ignite/ml/nn/MLPTrainerIntegrationTest.java | 4 +- .../org/apache/ignite/ml/nn/MLPTrainerTest.java | 2 +- .../MLPTrainerMnistIntegrationTest.java | 2 +- .../ml/nn/performance/MLPTrainerMnistTest.java | 2 +- .../linear/LinearRegressionModelTest.java | 2 +- .../logistic/LogisticRegressionModelTest.java | 2 +- .../ignite/ml/selection/SelectionTestSuite.java | 2 + .../paramgrid/ParameterSetGeneratorTest.java | 56 + .../ml/svm/SVMBinaryTrainerIntegrationTest.java | 102 + .../org/apache/ignite/ml/svm/SVMModelTest.java | 2 +- .../org/apache/ignite/ml/svm/SVMTestSuite.java | 3 +- .../ApiParity/CacheParityTest.cs | 3 +- .../ApiParity/ClusterParityTest.cs | 3 +- .../org/apache/ignite/spark/impl/package.scala | 2 +- .../ignite/spark/AbstractDataFrameSpec.scala | 6 +- .../spi/deployment/uri/UriDeploymentSpi.java | 4 + modules/web-console/backend/middlewares/api.js | 5 + .../migrations/1516948939797-migrate-configs.js | 121 +- .../backend/migrations/migration-utils.js | 38 +- modules/web-console/backend/package.json | 2 +- modules/web-console/backend/routes/admin.js | 4 +- .../backend/services/notifications.js | 4 +- .../testcafe/fixtures/configuration/basic.js | 3 +- .../configuration/clusterFormChangeDetection.js | 56 + modules/web-console/e2e/testcafe/helpers.js | 4 +- modules/web-console/e2e/testcafe/package.json | 4 +- .../PageConfigurationAdvancedCluster.js | 8 +- .../page-models/PageConfigurationBasic.js | 2 +- .../page-models/PageConfigurationOverview.js | 10 +- .../pageConfigurationAdvancedIGFS.js | 4 +- .../pageConfigurationAdvancedModels.js | 6 +- modules/web-console/frontend/app/app.js | 7 +- .../components/cluster-selector/controller.js | 1 + .../connected-clusters-badge/style.scss | 2 +- .../components/cluster-edit-form/controller.js | 6 +- .../cluster-edit-form/templates/binary.pug | 4 +- .../page-configure-overview/controller.js | 5 + .../page-configure-overview/style.scss | 2 +- .../page-configure-overview/template.pug | 14 +- .../page-configure/components/fakeUICanExit.js | 27 +- .../components/fakeUICanExit.spec.js | 32 + .../app/components/page-configure/states.js | 6 - .../app/components/page-configure/template.pug | 10 +- .../page-forgot-password/template.pug | 2 +- .../app/components/page-profile/index.js | 12 +- .../app/components/page-profile/style.scss | 3 + .../app/components/page-profile/template.pug | 16 +- .../components/queries-notebook/style.scss | 47 +- .../queries-notebook/template.tpl.pug | 163 +- .../queries-notebooks-list/controller.js | 6 +- .../app/components/page-queries/index.js | 33 +- .../app/components/page-signin/template.pug | 2 +- .../app/components/page-signup/template.pug | 2 +- .../app/components/ui-grid-hovering/style.scss | 6 + .../components/user-notifications/service.js | 2 +- .../components/web-console-footer/template.pug | 2 +- .../components/web-console-header/style.scss | 7 +- .../components/web-console-header/template.pug | 4 +- .../frontend/app/data/getting-started.json | 30 +- modules/web-console/frontend/app/data/i18n.js | 2 +- .../app/modules/agent/AgentManager.service.js | 4 +- .../agent/components/cluster-login/template.pug | 7 +- .../app/modules/nodes/nodes-dialog.tpl.pug | 2 +- .../frontend/app/modules/states/admin.state.js | 12 +- .../app/modules/states/settings.state.js | 33 + .../frontend/app/primitives/badge/index.scss | 2 +- .../frontend/app/primitives/btn/index.scss | 5 + .../frontend/app/services/Version.service.js | 6 +- modules/web-console/frontend/package.json | 10 +- .../frontend/public/images/cache.png | Bin 24791 -> 15087 bytes .../frontend/public/images/cluster-quick.png | Bin 0 -> 16407 bytes .../frontend/public/images/cluster.png | Bin 29376 -> 24083 bytes .../frontend/public/images/domains.png | Bin 22131 -> 17899 bytes .../web-console/frontend/public/images/igfs.png | Bin 14139 -> 14683 bytes .../frontend/public/images/main-screenshot.png | Bin 86830 -> 0 bytes .../frontend/public/images/multicluster.png | Bin 21921 -> 31178 bytes .../frontend/public/images/preview.png | Bin 0 -> 29829 bytes .../frontend/public/images/query-chart.png | Bin 17142 -> 0 bytes .../frontend/public/images/query-metadata.png | Bin 39361 -> 0 bytes .../frontend/public/images/query-table.png | Bin 28065 -> 19943 bytes .../frontend/public/images/summary.png | Bin 33650 -> 0 bytes .../frontend/public/stylesheets/style.scss | 73 +- modules/web-console/frontend/views/403.tpl.pug | 2 +- modules/web-console/frontend/views/404.tpl.pug | 2 +- modules/web-console/frontend/views/base.pug | 4 +- modules/web-console/frontend/views/base2.pug | 26 - .../frontend/views/includes/header-left.pug | 2 +- .../frontend/views/includes/header-right.pug | 2 +- .../frontend/views/templates/dropdown.tpl.pug | 2 +- .../frontend/webpack/webpack.common.js | 2 +- .../discovery/zk/internal/ZookeeperClient.java | 126 +- .../zk/internal/ZookeeperDiscoveryImpl.java | 13 +- .../internal/ZookeeperDiscoveryStatistics.java | 7 + .../zk/internal/ZookeeperClientTest.java | 93 + .../zk/internal/ZookeeperDiscoverySpiTest.java | 139 +- parent/pom.xml | 10 +- 372 files changed, 6443 insertions(+), 3588 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a867641d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java ----------------------------------------------------------------------
