This is an automated email from the ASF dual-hosted git repository. pdesai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git
The following commit(s) were added to refs/heads/master by this push: new f783a44 Fix bad Dockerfile license and use ASF release config. (#64) f783a44 is described below commit f783a44c6ea90df2387d07df9bc89c018da5f173 Author: Matt Rutkowski <mrutk...@us.ibm.com> AuthorDate: Tue May 29 18:45:29 2018 -0500 Fix bad Dockerfile license and use ASF release config. (#64) --- core/swift3.1.1Action/Dockerfile | 23 ++++++++++++----------- core/swift41Action/Dockerfile | 23 ++++++++++++----------- tools/travis/build.sh | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/core/swift3.1.1Action/Dockerfile b/core/swift3.1.1Action/Dockerfile index 016624a..dc64d91 100755 --- a/core/swift3.1.1Action/Dockerfile +++ b/core/swift3.1.1Action/Dockerfile @@ -1,17 +1,18 @@ # -# 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: +# 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 +# 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. +# 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. # # Dockerfile for swift actions, overrides and extends ActionRunner from actionProxy diff --git a/core/swift41Action/Dockerfile b/core/swift41Action/Dockerfile index 8897ae8..cd3ae84 100644 --- a/core/swift41Action/Dockerfile +++ b/core/swift41Action/Dockerfile @@ -1,17 +1,18 @@ # -# 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: +# 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 +# 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. +# 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. # # TODO Replace this dockerfile and extend from official image when 4.1 is released diff --git a/tools/travis/build.sh b/tools/travis/build.sh index f6d5b34..88d3558 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -31,7 +31,7 @@ IMAGE_PREFIX="testing" # run scancode using the ASF Release configuration cd $UTILDIR -scancode/scanCode.py --config scancode/ASF-Release-v2.cfg $ROOTDIR +scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR # Build OpenWhisk cd $WHISKDIR -- To stop receiving notification emails like this one, please contact pde...@apache.org.