Fixing conflicts'
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/df08a37c Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/df08a37c Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/df08a37c Branch: refs/heads/master Commit: df08a37c4112cbe1161f5c20f985e9c1c9abff42 Parents: d108041 ca8b493 Author: Andrew Musselman <[email protected]> Authored: Sun Dec 17 19:45:23 2017 -0800 Committer: Andrew Musselman <[email protected]> Committed: Sun Dec 17 19:45:23 2017 -0800 ---------------------------------------------------------------------- .travis.yml | 19 +- buildtools/change-scala-version.sh | 75 +++++ distribution/pom.xml | 173 +++++++++++ doap_Mahout.rdf | 4 +- examples/bin/classify-wikipedia.sh | 2 +- flink/pom.xml | 2 +- h2o/pom.xml | 2 +- math-scala/pom.xml | 2 +- .../math/algorithms/clustering/Canopy.scala | 1 - .../org/apache/mahout/math/SparseRowMatrix.java | 53 ++++ pom.xml | 11 +- spark/pom.xml | 23 +- viennacl-omp/pom.xml | 4 +- viennacl/pom.xml | 4 +- website/build_site.sh | 47 +++ website/docs/_includes/navbar.html | 5 +- website/docs/screenshots/landing.png | Bin 205187 -> 0 bytes website/docs/screenshots/mr-algos.png | Bin 316933 -> 0 bytes website/docs/screenshots/tutorials.png | Bin 350203 -> 0 bytes .../docs/tutorials/cco-lastfm/cco-lastfm.scala | 33 +- website/front/404.html | 1 - website/front/Gemfile | 5 - website/front/README.md | 5 - website/front/Rakefile | 306 ------------------- website/front/_config.yml | 134 -------- website/front/_includes/JB | 1 - website/front/_includes/navbar.html | 91 ------ website/front/_includes/themes | 1 - website/front/_layouts/default.html | 6 - website/front/_layouts/page.html | 7 - website/front/_layouts/post.html | 7 - website/front/_plugins/debug.rb | 38 --- website/front/archive.html | 10 - website/front/assets | 1 - website/front/categories.html | 22 -- website/front/changelog.md | 70 ----- website/front/community/blogs.md | 28 -- website/front/community/buildingmahout.md | 128 -------- website/front/community/gsoc.md | 64 ---- website/front/community/history.md | 20 -- website/front/community/mailing-lists.md | 47 --- website/front/community/privacy-policy.md | 30 -- .../front/community/recent-upcoming-talks.md | 19 -- website/front/community/who-we-are.md | 64 ---- website/front/developers/githubPRs.md | 84 ----- .../developers/how-to-become-a-committer.md | 28 -- website/front/developers/how-to-contribute.md | 155 ---------- website/front/developers/how-to-release.md | 241 --------------- .../developers/how-to-update-the-website.md | 40 --- website/front/developers/index.md | 47 --- website/front/developers/issue-tracker.md | 46 --- website/front/developers/key-concepts.md | 43 --- website/front/developers/patch-check-list.md | 30 -- website/front/developers/publish-website.md | 123 -------- website/front/developers/release-notes.md | 249 --------------- website/front/developers/version-control.md | 38 --- website/front/downloads.md | 67 ---- website/front/index.md | 148 --------- website/front/screenshots/landing.png | Bin 338899 -> 0 bytes website/oldsite/_config.yml | 63 ++-- website/oldsite/developers/buildingmahout.md | 187 ++++++++++-- .../developers/how-to-update-the-website.md | 18 +- website/oldsite/index.md | 2 +- 63 files changed, 626 insertions(+), 2548 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/df08a37c/distribution/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/df08a37c/h2o/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/df08a37c/math-scala/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/df08a37c/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/df08a37c/spark/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/df08a37c/viennacl-omp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/df08a37c/viennacl/pom.xml ----------------------------------------------------------------------
