Merge remote-tracking branch 'remotes/origin/master' into ignite-zk # Conflicts: # modules/web-console/frontend/app/modules/configuration/generator/JavaTransformer.service.js # modules/web-console/frontend/app/modules/configuration/generator/SpringTransformer.service.js
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a1cdefc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a1cdefc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a1cdefc Branch: refs/heads/ignite-zk Commit: 7a1cdefc5bd97fef44890f3f0c49134653ddcf8e Parents: 44a81bb 7994de4 Author: sboikov <[email protected]> Authored: Fri Jan 12 13:02:43 2018 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 12 13:02:43 2018 +0300 ---------------------------------------------------------------------- examples/pom.xml | 11 ++ .../examples/ml/math/tracer/TracerExample.java | 6 +- .../testsuites/IgniteExamplesMLTestSuite.java | 140 +++++++++++++++++++ .../java/org/apache/ignite/ml/math/Tracer.java | 118 ++++++++++++---- .../org/apache/ignite/ml/math/TracerTest.java | 50 +++++-- .../generator/JavaTransformer.service.js | 10 +- .../generator/SpringTransformer.service.js | 10 +- .../configuration/summary/summary.worker.js | 8 +- 8 files changed, 296 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
