You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ak...@apache.org on 2017/04/15 04:20:43 UTC
[1/3] mahout git commit: Rolling back
Repository: mahout
Updated Branches:
refs/heads/master 84d43790f -> 31b611f6f
Rolling back
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/98ca93ed
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/98ca93ed
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/98ca93ed
Branch: refs/heads/master
Commit: 98ca93ed31ea9d84f925ef89886ecd52584da6c7
Parents: 13019f7
Author: Andrew Musselman <ak...@apache.org>
Authored: Fri Apr 14 21:17:12 2017 -0700
Committer: Andrew Musselman <ak...@apache.org>
Committed: Fri Apr 14 21:17:12 2017 -0700
----------------------------------------------------------------------
buildtools/pom.xml | 2 +-
distribution/pom.xml | 3 ++-
examples/pom.xml | 2 +-
h2o/pom.xml | 2 +-
hdfs/pom.xml | 2 +-
integration/pom.xml | 2 +-
math-scala/pom.xml | 2 +-
math/pom.xml | 2 +-
mr/pom.xml | 2 +-
pom.xml | 2 +-
spark/pom.xml | 2 +-
viennacl-omp/pom.xml | 2 +-
viennacl/pom.xml | 2 +-
13 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/buildtools/pom.xml
----------------------------------------------------------------------
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index a28dbf4..c96b3a5 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-buildtools</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<name>Mahout Build Tools</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2bf39e4..9aca118 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>apache-mahout-distribution</artifactId>
@@ -156,6 +156,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 3798117..b3bf827 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/h2o/pom.xml
----------------------------------------------------------------------
diff --git a/h2o/pom.xml b/h2o/pom.xml
index 5cb25e1..8811f2b 100644
--- a/h2o/pom.xml
+++ b/h2o/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/hdfs/pom.xml b/hdfs/pom.xml
index 37fcb89..34b104e 100644
--- a/hdfs/pom.xml
+++ b/hdfs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/pom.xml b/integration/pom.xml
index 5a873a6..d9945d9 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/math-scala/pom.xml
----------------------------------------------------------------------
diff --git a/math-scala/pom.xml b/math-scala/pom.xml
index 02fe265..8951b29 100644
--- a/math-scala/pom.xml
+++ b/math-scala/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/math/pom.xml
----------------------------------------------------------------------
diff --git a/math/pom.xml b/math/pom.xml
index 2f088a0..ec5e668 100644
--- a/math/pom.xml
+++ b/math/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/mr/pom.xml
----------------------------------------------------------------------
diff --git a/mr/pom.xml b/mr/pom.xml
index b9cd010..8d50e33 100644
--- a/mr/pom.xml
+++ b/mr/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8485c7c..6e249a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Mahout</name>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index e08cbf3..231d53a 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/viennacl-omp/pom.xml
----------------------------------------------------------------------
diff --git a/viennacl-omp/pom.xml b/viennacl-omp/pom.xml
index 296c5c3..764eed7 100644
--- a/viennacl-omp/pom.xml
+++ b/viennacl-omp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/98ca93ed/viennacl/pom.xml
----------------------------------------------------------------------
diff --git a/viennacl/pom.xml b/viennacl/pom.xml
index f624c83..c85d7de 100644
--- a/viennacl/pom.xml
+++ b/viennacl/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
[2/3] mahout git commit: Merge branch 'master' of
github.com:apache/mahout
Posted by ak...@apache.org.
Merge branch 'master' of github.com:apache/mahout
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/eef02000
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/eef02000
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/eef02000
Branch: refs/heads/master
Commit: eef02000ad748d5a28f418c2da5fcff877de542f
Parents: 98ca93e 84d4379
Author: Andrew Musselman <ak...@apache.org>
Authored: Fri Apr 14 21:17:20 2017 -0700
Committer: Andrew Musselman <ak...@apache.org>
Committed: Fri Apr 14 21:17:20 2017 -0700
----------------------------------------------------------------------
distribution/src/main/assembly/bin.xml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
[3/3] mahout git commit: Removing extra vienna blocks in bin.xml
Posted by ak...@apache.org.
Removing extra vienna blocks in bin.xml
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/31b611f6
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/31b611f6
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/31b611f6
Branch: refs/heads/master
Commit: 31b611f6f4a773e944fabf827d9ff747bc9624dc
Parents: eef0200
Author: Andrew Musselman <ak...@apache.org>
Authored: Fri Apr 14 21:20:33 2017 -0700
Committer: Andrew Musselman <ak...@apache.org>
Committed: Fri Apr 14 21:20:33 2017 -0700
----------------------------------------------------------------------
distribution/src/main/assembly/bin.xml | 24 ------------------------
1 file changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/31b611f6/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
index 88608d1..522f48a 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -129,30 +129,6 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../viennacl/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../viennacl-omp/target</directory>
- <includes>
- <include>mahout-*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
- </excludes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../spark/target</directory>
<includes>
<include>mahout-*.jar</include>