Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/fd7a0bf9 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/fd7a0bf9 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/fd7a0bf9 Branch: refs/heads/master Commit: fd7a0bf969e19f069dc97c7d908f9c120c58acdd Parents: d319b32 b044a07 Author: pferrel <[email protected]> Authored: Wed Jun 11 19:17:59 2014 -0700 Committer: pferrel <[email protected]> Committed: Wed Jun 11 19:17:59 2014 -0700 ---------------------------------------------------------------------- CHANGELOG | 4 +++ .../apache/mahout/math/decompositions/ALS.scala | 5 +++- .../mahout/math/FunctionalMatrixView.java | 8 ++++++ .../org/apache/mahout/math/MatricesTest.java | 17 +++++++++++ .../sparkbindings/shell/MahoutSparkILoop.scala | 7 +++++ .../mahout/sparkbindings/drm/package.scala | 12 +++++++- .../mahout/sparkbindings/drm/DrmLikeSuite.scala | 30 ++++++++++++++++++++ 7 files changed, 81 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
