Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-7573
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fde86683 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fde86683 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fde86683 Branch: refs/heads/ignite-7573 Commit: fde86683cd509131242260a33bc414e2a984ca02 Parents: 6c9dfeb 21644ef Author: Alexey Goncharuk <[email protected]> Authored: Wed Jan 31 12:27:44 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Jan 31 12:27:44 2018 +0300 ---------------------------------------------------------------------- bin/control.bat | 4 +- bin/ignite.bat | 4 +- bin/ignitevisorcmd.bat | 4 +- bin/include/functions.sh | 2 +- .../KNNClassificationExample.java | 17 +- .../ignite/examples/ml/knn/datasets/README.md | 2 - .../ml/knn/datasets/cleared_machines.txt | 209 ------------------- .../ignite/examples/ml/knn/datasets/iris.txt | 150 ------------- .../ml/knn/regression/KNNRegressionExample.java | 18 +- examples/src/main/resources/datasets/README.md | 2 + .../resources/datasets/cleared_machines.txt | 209 +++++++++++++++++++ examples/src/main/resources/datasets/iris.txt | 150 +++++++++++++ .../GridDhtPartitionsExchangeFuture.java | 29 ++- .../GridCacheDatabaseSharedManager.java | 57 +++-- .../cluster/DiscoveryDataClusterState.java | 9 +- .../cluster/GridClusterStateProcessor.java | 2 +- .../distributed/CacheBaselineTopologyTest.java | 102 +++++---- .../TxPessimisticDeadlockDetectionTest.java | 2 + modules/ignored-tests/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/configure.acrel | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +- .../cpp/odbc/install/ignite-odbc-x86.wxs | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +- parent/pom.xml | 4 +- pom.xml | 4 +- scripts/update-versions.sh | 35 ++++ 44 files changed, 613 insertions(+), 500 deletions(-) ----------------------------------------------------------------------
