Merge branch 'flink-binding' of https://git-wip-us.apache.org/repos/asf/mahout into flink-binding
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/9f6f62ac Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/9f6f62ac Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/9f6f62ac Branch: refs/heads/flink-binding Commit: 9f6f62acfaa501f183bdfd29c42de815db24201d Parents: 0df6e08 f5a4a97 Author: Dmitriy Lyubimov <[email protected]> Authored: Sat Oct 24 14:07:07 2015 -0700 Committer: Dmitriy Lyubimov <[email protected]> Committed: Sat Oct 24 14:07:07 2015 -0700 ---------------------------------------------------------------------- buildtools/pom.xml | 4 +- distribution/pom.xml | 2 +- examples/pom.xml | 2 +- flink/pom.xml | 2 +- h2o/pom.xml | 2 +- hdfs/pom.xml | 2 +- integration/pom.xml | 2 +- math-scala/pom.xml | 8 +- .../common/io/GenericMatrixKryoSerializer.scala | 188 ++++++++++++++ .../mahout/common/io/VectorKryoSerializer.scala | 248 ++++++++++++++++++ math/pom.xml | 2 +- mr/pom.xml | 2 +- pom.xml | 7 +- spark-shell/pom.xml | 2 +- spark/pom.xml | 2 +- .../apache/mahout/common/Hadoop1HDFSUtil.scala | 8 +- .../io/GenericMatrixKryoSerializer.scala | 189 -------------- .../io/MahoutKryoRegistrator.scala | 1 + .../sparkbindings/io/VectorKryoSerializer.scala | 252 ------------------- .../sparkbindings/SparkBindingsSuite.scala | 6 +- .../mahout/sparkbindings/io/IOSuite.scala | 6 +- 21 files changed, 468 insertions(+), 469 deletions(-) ----------------------------------------------------------------------
