You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2017/02/15 23:14:47 UTC

incubator-predictionio git commit: [PIO-53] Fix license headers and docker compose

Repository: incubator-predictionio
Updated Branches:
  refs/heads/develop e72d66e20 -> cb1462592


[PIO-53] Fix license headers and docker compose


Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/cb146259
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/cb146259
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/cb146259

Branch: refs/heads/develop
Commit: cb146259240ff07143751012120931ba5a8d9102
Parents: e72d66e
Author: Donald Szeto <do...@apache.org>
Authored: Wed Feb 15 15:14:08 2017 -0800
Committer: Donald Szeto <do...@apache.org>
Committed: Wed Feb 15 15:14:08 2017 -0800

----------------------------------------------------------------------
 tests/.rat-excludes                     |  1 +
 tests/build-docker.sh                   | 15 +++++++++++++++
 tests/docker-compose.yml                | 17 ++++++++++++++++-
 tests/docker-files/wait-for-postgres.sh | 16 +++++++++++++++-
 4 files changed, 47 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/cb146259/tests/.rat-excludes
----------------------------------------------------------------------
diff --git a/tests/.rat-excludes b/tests/.rat-excludes
index 840a3e9..ada9d0f 100644
--- a/tests/.rat-excludes
+++ b/tests/.rat-excludes
@@ -18,6 +18,7 @@ spark-defaults.conf
 Gemfile.lock
 templates.yaml
 semver.sh
+pgpass
 
 PredictionIO-.*/*
 target/*

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/cb146259/tests/build-docker.sh
----------------------------------------------------------------------
diff --git a/tests/build-docker.sh b/tests/build-docker.sh
index fe783cb..ae78cac 100755
--- a/tests/build-docker.sh
+++ b/tests/build-docker.sh
@@ -1,5 +1,20 @@
 #!/bin/bash -x
 
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if [ ! -f $DIR/docker-files/spark-1.4.0-bin-hadoop2.6.tgz ]; then

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/cb146259/tests/docker-compose.yml
----------------------------------------------------------------------
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index d55834d..bd2dd6d 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -1,4 +1,19 @@
-version: "3"
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+version: "2"
 services:
   elasticsearch:
     image: elasticsearch:1-alpine

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/cb146259/tests/docker-files/wait-for-postgres.sh
----------------------------------------------------------------------
diff --git a/tests/docker-files/wait-for-postgres.sh b/tests/docker-files/wait-for-postgres.sh
index 3fcc27c..2c7d855 100755
--- a/tests/docker-files/wait-for-postgres.sh
+++ b/tests/docker-files/wait-for-postgres.sh
@@ -1,5 +1,19 @@
 #!/bin/bash
-# wait-for-postgres.sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
 
 set -e