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/a12135b9 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/a12135b9 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/a12135b9 Branch: refs/heads/master Commit: a12135b94002367046ef6edc977527d586026689 Parents: cc9a70e 99fd9ba Author: pferrel <[email protected]> Authored: Sun Jun 8 08:25:36 2014 -0700 Committer: pferrel <[email protected]> Committed: Sun Jun 8 08:25:36 2014 -0700 ---------------------------------------------------------------------- .../mahout/math/solver/ConjugateGradientSolver.java | 11 ++++++----- .../solver/DistributedConjugateGradientSolver.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
