You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ra...@apache.org on 2020/07/22 20:18:06 UTC

[mahout] branch trunk updated (b3fa798 -> 55ecd35)

This is an automated email from the ASF dual-hosted git repository.

rawkintrevo pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/mahout.git.


    from b3fa798  Merge pull request #402 from balashashanka/MAHOUT-2114
     new afd3570  MAHOUT-2116 Update Notice with current end date
     new 55ecd35  Merge branch 'trunk' of github.com:apache/mahout into trunk

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 NOTICE                  | 2 +-
 docker/build/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


[mahout] 02/02: Merge branch 'trunk' of github.com:apache/mahout into trunk

Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rawkintrevo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/mahout.git

commit 55ecd35a38cd3bcfe9b4906265fe545970f3ac1e
Merge: afd3570 b3fa798
Author: rawkintrevo <tr...@gmail.com>
AuthorDate: Wed Jul 22 15:16:51 2020 -0500

    Merge branch 'trunk' of github.com:apache/mahout into trunk

 LICENSE.txt => LICENSE                             |  0
 NOTICE.txt => NOTICE                               |  0
 distribution/src/main/assembly/bin.xml             | 25 +--------
 .../src/main/resources/executable/bin/mahout       | 64 ----------------------
 4 files changed, 1 insertion(+), 88 deletions(-)



[mahout] 01/02: MAHOUT-2116 Update Notice with current end date

Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rawkintrevo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/mahout.git

commit afd35700931871cc63ad11176be0a1321c136551
Author: rawkintrevo <tr...@gmail.com>
AuthorDate: Wed Jul 22 15:16:31 2020 -0500

    MAHOUT-2116 Update Notice with current end date
---
 NOTICE.txt              | 2 +-
 docker/build/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 29cb479..84968d4 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,6 +1,6 @@
 ==============================================================
  Apache Mahout
- Copyright 2009 and onwards The Apache Software Foundation
+ Copyright 2009-2020 The Apache Software Foundation
 ==============================================================
 
 This product includes software developed by
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index e3989c8..4b082cf 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -12,11 +12,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM ubuntu:16.04
+FROM gettyimages/spark:2.3.1-hadoop-3.0 
 
 RUN apt update
 RUN apt install maven git default-jre default-jdk -y
 RUN git clone https://github.com/apache/mahout.git /mahout
 
 # RUN cd mahout & git checkout build-cleanup
-# ^^ this doesn't work bc I'm bad at docker and linux and computers (tg)
\ No newline at end of file
+# ^^ this doesn't work bc I'm bad at docker and linux and computers (tg)