mikewalch closed pull request #243: Fixes #241 - Updated license file headers for ASF URL: https://github.com/apache/fluo-muchos/pull/243
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.travis.yml b/.travis.yml index c536f79..56fd747 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index d413329..0000000 --- a/AUTHORS +++ /dev/null @@ -1,5 +0,0 @@ -AUTHORS -------- - -Keith Turner - Peterson Technologies -Mike Walch - Peterson Technologies diff --git a/LICENSE b/LICENSE index e06d208..d645695 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Apache License + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -178,7 +179,7 @@ Apache License APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +187,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -199,4 +200,3 @@ Apache License 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. - diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..ab2e455 --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Fluo Muchos +Copyright 2018 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/bin/muchos b/bin/muchos index 26cd0f4..af9ec43 100755 --- a/bin/muchos +++ b/bin/muchos @@ -1,12 +1,13 @@ #! /usr/bin/env bash -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, diff --git a/conf/muchos.props.example b/conf/muchos.props.example index b999eaa..e4c1e67 100644 --- a/conf/muchos.props.example +++ b/conf/muchos.props.example @@ -1,10 +1,11 @@ -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, diff --git a/contrib/muchos-logo-dark.svg b/contrib/muchos-logo-dark.svg index c4bb4c8..5e978dc 100644 --- a/contrib/muchos-logo-dark.svg +++ b/contrib/muchos-logo-dark.svg @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- - Copyright 2016 Muchos authors (see AUTHORS) + 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 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, diff --git a/contrib/muchos-logo.svg b/contrib/muchos-logo.svg index 7bf2cd0..c5a4418 100644 --- a/contrib/muchos-logo.svg +++ b/contrib/muchos-logo.svg @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- - Copyright 2016 Muchos authors (see AUTHORS) + 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 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, @@ -14,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- This logo was created using: - Cloud Icon by Stephen Hutchings (CC BY-SA license) https://github.com/stephenhutchings/typicons.font diff --git a/lib/muchos/config.py b/lib/muchos/config.py index ad03164..73cd051 100644 --- a/lib/muchos/config.py +++ b/lib/muchos/config.py @@ -1,10 +1,11 @@ -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, diff --git a/lib/muchos/main.py b/lib/muchos/main.py index ba2061b..ab73f15 100644 --- a/lib/muchos/main.py +++ b/lib/muchos/main.py @@ -1,12 +1,13 @@ #!/usr/bin/env python2 -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, diff --git a/lib/muchos/util.py b/lib/muchos/util.py index 1ddea45..1827ad4 100644 --- a/lib/muchos/util.py +++ b/lib/muchos/util.py @@ -1,10 +1,11 @@ -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, diff --git a/lib/tests/test_config.py b/lib/tests/test_config.py index 288a04b..540d8f6 100644 --- a/lib/tests/test_config.py +++ b/lib/tests/test_config.py @@ -1,10 +1,11 @@ -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, diff --git a/lib/tests/test_util.py b/lib/tests/test_util.py index 9fc3c7c..55f3a96 100644 --- a/lib/tests/test_util.py +++ b/lib/tests/test_util.py @@ -1,10 +1,11 @@ -# Copyright 2014 Muchos authors (see AUTHORS) +# 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 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, ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
