[jira] [Commented] (AIRFLOW-2257) ValueError from flask-admin causing Charts feature to break

2018-04-14 Thread Brian Sloan (JIRA)

[ 
https://issues.apache.org/jira/browse/AIRFLOW-2257?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16438542#comment-16438542
 ] 

Brian Sloan commented on AIRFLOW-2257:
--

Updating Flask-Admin to 1.5.1 seems to have resolved the issue for me.

 

> ValueError from flask-admin causing Charts feature to break
> ---
>
> Key: AIRFLOW-2257
> URL: https://issues.apache.org/jira/browse/AIRFLOW-2257
> Project: Apache Airflow
>  Issue Type: Bug
>  Components: dependencies, ui
>Affects Versions: 1.9.0
>Reporter: Brian Sloan
>Priority: Major
>
> Using Airflow 1.9 and RDS PostgreSQL for the metadata database.
> This bug may be related to this flask-admin / sqlalchemy issue: 
> https://github.com/flask-admin/flask-admin/issues/1588
> To reproduce, go to "Data Profiling –> Charts" and click the Edit icon to 
> edit any chart. I get an HTTP 500 with this traceback:
> {code:java}
> Traceback (most recent call last):
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1988, in wsgi_app
> response = self.full_dispatch_request()
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1641, in full_dispatch_request
> rv = self.handle_user_exception(e)
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1544, in handle_user_exception
> reraise(exc_type, exc_value, tb)
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1639, in full_dispatch_request
> rv = self.dispatch_request()
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1625, in dispatch_request
> return self.view_functions[rule.endpoint](**req.view_args)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/base.py", 
> line 69, in inner
> return self._run_view(f, *args, **kwargs)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/base.py", 
> line 368, in _run_view
> return fn(self, *args, **kwargs)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/model/base.py",
>  line 1999, in edit_view
> return_url=return_url)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/base.py", 
> line 308, in render
> return render_template(template, **kwargs)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask/templating.py", 
> line 134, in render_template
> context, ctx.app)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask/templating.py", 
> line 116, in _render
> rv = template.render(context)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/jinja2/environment.py", 
> line 989, in render
> return self.environment.handle_exception(exc_info, True)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/jinja2/environment.py", 
> line 754, in handle_exception
> reraise(exc_type, exc_value, tb)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/airflow/www/templates/airflow/chart/edit.html",
>  line 18, in top-level template code
> {% extends 'admin/model/edit.html' %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/model/edit.html",
>  line 3, in top-level template code
> {% from 'admin/lib.html' import extra with context %} {# backward 
> compatible #}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/airflow/www/templates/admin/master.html",
>  line 18, in top-level template code
> {% extends 'admin/base.html' %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/base.html",
>  line 30, in top-level template code
> {% block page_body %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/airflow/www/templates/admin/master.html",
>  line 104, in block "page_body"
> {% block body %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/model/edit.html",
>  line 32, in block "body"
> {% block edit_form %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/model/edit.html",
>  line 33, in block "edit_form"
> {{ lib.render_form(form, return_url, extra(), form_opts) }}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/lib.html",
>  line 202, in template
> {% call form_tag(action=action) %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/lib.html",
>  line 182, in template
> {{ caller() }}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/lib.html",
>  line 203, in template
> {{ 

[jira] [Commented] (AIRFLOW-2257) ValueError from flask-admin causing Charts feature to break

2018-04-14 Thread Tao Feng (JIRA)

[ 
https://issues.apache.org/jira/browse/AIRFLOW-2257?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16438463#comment-16438463
 ] 

Tao Feng commented on AIRFLOW-2257:
---

can't reproduce with the master branch...

> ValueError from flask-admin causing Charts feature to break
> ---
>
> Key: AIRFLOW-2257
> URL: https://issues.apache.org/jira/browse/AIRFLOW-2257
> Project: Apache Airflow
>  Issue Type: Bug
>  Components: dependencies, ui
>Affects Versions: 1.9.0
>Reporter: Brian Sloan
>Priority: Major
>
> Using Airflow 1.9 and RDS PostgreSQL for the metadata database.
> This bug may be related to this flask-admin / sqlalchemy issue: 
> https://github.com/flask-admin/flask-admin/issues/1588
> To reproduce, go to "Data Profiling –> Charts" and click the Edit icon to 
> edit any chart. I get an HTTP 500 with this traceback:
> {code:java}
> Traceback (most recent call last):
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1988, in wsgi_app
> response = self.full_dispatch_request()
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1641, in full_dispatch_request
> rv = self.handle_user_exception(e)
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1544, in handle_user_exception
> reraise(exc_type, exc_value, tb)
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1639, in full_dispatch_request
> rv = self.dispatch_request()
>   File "/var/airflow/env/local/lib/python2.7/site-packages/flask/app.py", 
> line 1625, in dispatch_request
> return self.view_functions[rule.endpoint](**req.view_args)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/base.py", 
> line 69, in inner
> return self._run_view(f, *args, **kwargs)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/base.py", 
> line 368, in _run_view
> return fn(self, *args, **kwargs)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/model/base.py",
>  line 1999, in edit_view
> return_url=return_url)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/base.py", 
> line 308, in render
> return render_template(template, **kwargs)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask/templating.py", 
> line 134, in render_template
> context, ctx.app)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask/templating.py", 
> line 116, in _render
> rv = template.render(context)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/jinja2/environment.py", 
> line 989, in render
> return self.environment.handle_exception(exc_info, True)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/jinja2/environment.py", 
> line 754, in handle_exception
> reraise(exc_type, exc_value, tb)
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/airflow/www/templates/airflow/chart/edit.html",
>  line 18, in top-level template code
> {% extends 'admin/model/edit.html' %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/model/edit.html",
>  line 3, in top-level template code
> {% from 'admin/lib.html' import extra with context %} {# backward 
> compatible #}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/airflow/www/templates/admin/master.html",
>  line 18, in top-level template code
> {% extends 'admin/base.html' %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/base.html",
>  line 30, in top-level template code
> {% block page_body %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/airflow/www/templates/admin/master.html",
>  line 104, in block "page_body"
> {% block body %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/model/edit.html",
>  line 32, in block "body"
> {% block edit_form %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/model/edit.html",
>  line 33, in block "edit_form"
> {{ lib.render_form(form, return_url, extra(), form_opts) }}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/lib.html",
>  line 202, in template
> {% call form_tag(action=action) %}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/lib.html",
>  line 182, in template
> {{ caller() }}
>   File 
> "/var/airflow/env/local/lib/python2.7/site-packages/flask_admin/templates/bootstrap3/admin/lib.html",
>  line 203, in template
> {{ render_form_fields(form, 

[jira] [Assigned] (AIRFLOW-2287) Missing and incorrect license headers

2018-04-14 Thread Anonymous (JIRA)

 [ 
https://issues.apache.org/jira/browse/AIRFLOW-2287?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Anonymous reassigned AIRFLOW-2287:
--

Assignee: Bolke de Bruin

> Missing and incorrect license headers
> -
>
> Key: AIRFLOW-2287
> URL: https://issues.apache.org/jira/browse/AIRFLOW-2287
> Project: Apache Airflow
>  Issue Type: Improvement
>Reporter: Bolke de Bruin
>Assignee: Bolke de Bruin
>Priority: Blocker
> Fix For: 2.0.0
>
>
> * {color:#454545}a few files are missing licenses, like docs/Makefile{color}
>  * {color:#454545}please fix year in notice ("2016 and onwards” makes it a 
> little bard to work out when copyright would expire){color}
>  * {color:#454545}LICENSE is OK but some license texts are missing i.e. 
> Bootstrap Toggle, normalize.css, parallel.js. Note that in order to comply 
> with the terms of the the licenses the full text of the license MUST be 
> included.{color}
>  * {color:#454545}also note that ace and d3 are under a  BSD 3 clause not BSD 
> 2 clause{color}
>  * {color:#454545} A large number of files are missing the correct ASF 
> header. (see below){color}
>  ** {color:#454545}Re incorrect header not perfect but shows scope of the 
> issue:{color}
>  *** {color:#454545} find . -name "*.*" -exec grep "contributor license" {} 
> \; -print | wc{color}
>  *** {color:#454545} find . -name "*.*" -exec grep 
> "[http://www.apache.org/licenses/LICENSE-2.0]; {} \; -print | wc{color}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Resolved] (AIRFLOW-2287) Missing and incorrect license headers

2018-04-14 Thread Fokko Driesprong (JIRA)

 [ 
https://issues.apache.org/jira/browse/AIRFLOW-2287?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Fokko Driesprong resolved AIRFLOW-2287.
---
   Resolution: Fixed
Fix Version/s: (was: 1.10.0)
   2.0.0

Issue resolved by pull request #3219
[https://github.com/apache/incubator-airflow/pull/3219]

> Missing and incorrect license headers
> -
>
> Key: AIRFLOW-2287
> URL: https://issues.apache.org/jira/browse/AIRFLOW-2287
> Project: Apache Airflow
>  Issue Type: Improvement
>Reporter: Bolke de Bruin
>Priority: Blocker
> Fix For: 2.0.0
>
>
> * {color:#454545}a few files are missing licenses, like docs/Makefile{color}
>  * {color:#454545}please fix year in notice ("2016 and onwards” makes it a 
> little bard to work out when copyright would expire){color}
>  * {color:#454545}LICENSE is OK but some license texts are missing i.e. 
> Bootstrap Toggle, normalize.css, parallel.js. Note that in order to comply 
> with the terms of the the licenses the full text of the license MUST be 
> included.{color}
>  * {color:#454545}also note that ace and d3 are under a  BSD 3 clause not BSD 
> 2 clause{color}
>  * {color:#454545} A large number of files are missing the correct ASF 
> header. (see below){color}
>  ** {color:#454545}Re incorrect header not perfect but shows scope of the 
> issue:{color}
>  *** {color:#454545} find . -name "*.*" -exec grep "contributor license" {} 
> \; -print | wc{color}
>  *** {color:#454545} find . -name "*.*" -exec grep 
> "[http://www.apache.org/licenses/LICENSE-2.0]; {} \; -print | wc{color}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[11/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/example_dags/docker_copy_data.py
--
diff --git a/airflow/example_dags/docker_copy_data.py 
b/airflow/example_dags/docker_copy_data.py
index 7d7172c..87d1174 100644
--- a/airflow/example_dags/docker_copy_data.py
+++ b/airflow/example_dags/docker_copy_data.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 '''
 This sample "listen to directory". move the new file and print it, using 
docker-containers.
 The following operators are being used: DockerOperator, BashOperator & 
ShortCircuitOperator.

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/example_dags/entrypoint.sh
--
diff --git a/airflow/example_dags/entrypoint.sh 
b/airflow/example_dags/entrypoint.sh
index 4421453..15858fa 100644
--- a/airflow/example_dags/entrypoint.sh
+++ b/airflow/example_dags/entrypoint.sh
@@ -1,14 +1,19 @@
 #
-# 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
-#
-# 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.
+# 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.
 
 ["/bin/bash", "-c", "/bin/sleep 30; /bin/mv {{params.source_location}}/{{ 
ti.xcom_pull('view_file') }} {{params.target_location}}; /bin/echo 
'{{params.target_location}}/{{ ti.xcom_pull('view_file') }}';"]

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/example_dags/example_bash_operator.py
--
diff --git a/airflow/example_dags/example_bash_operator.py 
b/airflow/example_dags/example_bash_operator.py
index 6887fa9..439e4f4 100644
--- a/airflow/example_dags/example_bash_operator.py
+++ b/airflow/example_dags/example_bash_operator.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 

[05/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/contrib/hooks/test_discord_webhook_hook.py
--
diff --git a/tests/contrib/hooks/test_discord_webhook_hook.py 
b/tests/contrib/hooks/test_discord_webhook_hook.py
index 80906ac..c92b198 100644
--- a/tests/contrib/hooks/test_discord_webhook_hook.py
+++ b/tests/contrib/hooks/test_discord_webhook_hook.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 #
 import json
 import unittest

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/contrib/hooks/test_emr_hook.py
--
diff --git a/tests/contrib/hooks/test_emr_hook.py 
b/tests/contrib/hooks/test_emr_hook.py
index 119df99..dc981ba 100644
--- a/tests/contrib/hooks/test_emr_hook.py
+++ b/tests/contrib/hooks/test_emr_hook.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 #
 
 import unittest

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/contrib/hooks/test_ftp_hook.py
--
diff --git a/tests/contrib/hooks/test_ftp_hook.py 
b/tests/contrib/hooks/test_ftp_hook.py
index c81593d..ac5db56 100644
--- a/tests/contrib/hooks/test_ftp_hook.py
+++ b/tests/contrib/hooks/test_ftp_hook.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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 

[12/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/contrib/operators/hipchat_operator.py
--
diff --git a/airflow/contrib/operators/hipchat_operator.py 
b/airflow/contrib/operators/hipchat_operator.py
index d82ad61..9bb43f1 100644
--- a/airflow/contrib/operators/hipchat_operator.py
+++ b/airflow/contrib/operators/hipchat_operator.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 from builtins import str
 

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/contrib/operators/hive_to_dynamodb.py
--
diff --git a/airflow/contrib/operators/hive_to_dynamodb.py 
b/airflow/contrib/operators/hive_to_dynamodb.py
index 5c7bb8e..31cca7c 100644
--- a/airflow/contrib/operators/hive_to_dynamodb.py
+++ b/airflow/contrib/operators/hive_to_dynamodb.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 import json
 

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/contrib/operators/jenkins_job_trigger_operator.py
--
diff --git a/airflow/contrib/operators/jenkins_job_trigger_operator.py 
b/airflow/contrib/operators/jenkins_job_trigger_operator.py
index 5227b24..33d602e 100644
--- a/airflow/contrib/operators/jenkins_job_trigger_operator.py
+++ b/airflow/contrib/operators/jenkins_job_trigger_operator.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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 

[06/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/scripts/ci/airflow_travis.cfg
--
diff --git a/scripts/ci/airflow_travis.cfg b/scripts/ci/airflow_travis.cfg
index 575aca9..140ecab 100644
--- a/scripts/ci/airflow_travis.cfg
+++ b/scripts/ci/airflow_travis.cfg
@@ -1,15 +1,20 @@
 #
-# 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
-#
-# 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.
+# 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.
 
 [core]
 airflow_home = ~/airflow

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/scripts/ci/kadm5.acl
--
diff --git a/scripts/ci/kadm5.acl b/scripts/ci/kadm5.acl
index 414b52f..691dce6 100644
--- a/scripts/ci/kadm5.acl
+++ b/scripts/ci/kadm5.acl
@@ -1,13 +1,18 @@
 #
-# 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
-#
-# 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.
+# 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.
 */admin@TEST.LOCAL*

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/scripts/ci/kdc.conf
--
diff --git a/scripts/ci/kdc.conf b/scripts/ci/kdc.conf
index 1ae1cb4..5eef305 100644
--- a/scripts/ci/kdc.conf
+++ b/scripts/ci/kdc.conf
@@ -1,15 +1,20 @@
 #
-# 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
-#
-# 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.
+# 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

[09/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/operators/hive_to_druid.py
--
diff --git a/airflow/operators/hive_to_druid.py 
b/airflow/operators/hive_to_druid.py
index e420dfd..cec0078 100644
--- a/airflow/operators/hive_to_druid.py
+++ b/airflow/operators/hive_to_druid.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 from airflow.hooks.hive_hooks import HiveCliHook, HiveMetastoreHook
 from airflow.hooks.druid_hook import DruidHook
 from airflow.models import BaseOperator

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/operators/hive_to_mysql.py
--
diff --git a/airflow/operators/hive_to_mysql.py 
b/airflow/operators/hive_to_mysql.py
index 6962d31..164f887 100644
--- a/airflow/operators/hive_to_mysql.py
+++ b/airflow/operators/hive_to_mysql.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 from airflow.hooks.hive_hooks import HiveServer2Hook
 from airflow.hooks.mysql_hook import MySqlHook
 from airflow.models import BaseOperator

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/operators/hive_to_samba_operator.py
--
diff --git a/airflow/operators/hive_to_samba_operator.py 
b/airflow/operators/hive_to_samba_operator.py
index 93ebec1..ad6ccb3 100644
--- a/airflow/operators/hive_to_samba_operator.py
+++ b/airflow/operators/hive_to_samba_operator.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# 

[jira] [Commented] (AIRFLOW-2287) Missing and incorrect license headers

2018-04-14 Thread ASF subversion and git services (JIRA)

[ 
https://issues.apache.org/jira/browse/AIRFLOW-2287?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16438265#comment-16438265
 ] 

ASF subversion and git services commented on AIRFLOW-2287:
--

Commit c7a472ed6b0d8a4720f57ba1140c8cf665757167 in incubator-airflow's branch 
refs/heads/master from [~bolke]
[ https://git-wip-us.apache.org/repos/asf?p=incubator-airflow.git;h=c7a472e ]

[AIRFLOW-2287] Fix incorrect ASF headers

Closes #3219 from bolkedebruin/fix_header


> Missing and incorrect license headers
> -
>
> Key: AIRFLOW-2287
> URL: https://issues.apache.org/jira/browse/AIRFLOW-2287
> Project: Apache Airflow
>  Issue Type: Improvement
>Reporter: Bolke de Bruin
>Priority: Blocker
> Fix For: 1.10.0
>
>
> * {color:#454545}a few files are missing licenses, like docs/Makefile{color}
>  * {color:#454545}please fix year in notice ("2016 and onwards” makes it a 
> little bard to work out when copyright would expire){color}
>  * {color:#454545}LICENSE is OK but some license texts are missing i.e. 
> Bootstrap Toggle, normalize.css, parallel.js. Note that in order to comply 
> with the terms of the the licenses the full text of the license MUST be 
> included.{color}
>  * {color:#454545}also note that ace and d3 are under a  BSD 3 clause not BSD 
> 2 clause{color}
>  * {color:#454545} A large number of files are missing the correct ASF 
> header. (see below){color}
>  ** {color:#454545}Re incorrect header not perfect but shows scope of the 
> issue:{color}
>  *** {color:#454545} find . -name "*.*" -exec grep "contributor license" {} 
> \; -print | wc{color}
>  *** {color:#454545} find . -name "*.*" -exec grep 
> "[http://www.apache.org/licenses/LICENSE-2.0]; {} \; -print | wc{color}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[08/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/ti_deps/deps/base_ti_dep.py
--
diff --git a/airflow/ti_deps/deps/base_ti_dep.py 
b/airflow/ti_deps/deps/base_ti_dep.py
index 810852d..d444faf 100644
--- a/airflow/ti_deps/deps/base_ti_dep.py
+++ b/airflow/ti_deps/deps/base_ti_dep.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 from collections import namedtuple
 
 from airflow.utils.db import provide_session

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/ti_deps/deps/dag_ti_slots_available_dep.py
--
diff --git a/airflow/ti_deps/deps/dag_ti_slots_available_dep.py 
b/airflow/ti_deps/deps/dag_ti_slots_available_dep.py
index 799d1cc..c3245eb 100644
--- a/airflow/ti_deps/deps/dag_ti_slots_available_dep.py
+++ b/airflow/ti_deps/deps/dag_ti_slots_available_dep.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 from airflow.ti_deps.deps.base_ti_dep import BaseTIDep
 from airflow.utils.db import provide_session
 

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/ti_deps/deps/dag_unpaused_dep.py
--
diff --git a/airflow/ti_deps/deps/dag_unpaused_dep.py 
b/airflow/ti_deps/deps/dag_unpaused_dep.py
index 6d6bf32..adf150f 100644
--- a/airflow/ti_deps/deps/dag_unpaused_dep.py
+++ b/airflow/ti_deps/deps/dag_unpaused_dep.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional 

[13/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/contrib/hooks/gcp_pubsub_hook.py
--
diff --git a/airflow/contrib/hooks/gcp_pubsub_hook.py 
b/airflow/contrib/hooks/gcp_pubsub_hook.py
index e45ad63..b186174 100644
--- a/airflow/contrib/hooks/gcp_pubsub_hook.py
+++ b/airflow/contrib/hooks/gcp_pubsub_hook.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 from uuid import uuid4
 

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/contrib/hooks/gcs_hook.py
--
diff --git a/airflow/contrib/hooks/gcs_hook.py 
b/airflow/contrib/hooks/gcs_hook.py
index 09c42e3..494e05f 100644
--- a/airflow/contrib/hooks/gcs_hook.py
+++ b/airflow/contrib/hooks/gcs_hook.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 #
 from apiclient.discovery import build
 from apiclient.http import MediaFileUpload

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/contrib/hooks/jenkins_hook.py
--
diff --git a/airflow/contrib/hooks/jenkins_hook.py 
b/airflow/contrib/hooks/jenkins_hook.py
index 66d570e..55e88ba 100644
--- a/airflow/contrib/hooks/jenkins_hook.py
+++ b/airflow/contrib/hooks/jenkins_hook.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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 

[07/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/www/api/experimental/__init__.py
--
diff --git a/airflow/www/api/experimental/__init__.py 
b/airflow/www/api/experimental/__init__.py
index 759b563..db5ba59 100644
--- a/airflow/www/api/experimental/__init__.py
+++ b/airflow/www/api/experimental/__init__.py
@@ -1,14 +1,19 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 #

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/www/api/experimental/endpoints.py
--
diff --git a/airflow/www/api/experimental/endpoints.py 
b/airflow/www/api/experimental/endpoints.py
index f72b5ec..9cd0af8 100644
--- a/airflow/www/api/experimental/endpoints.py
+++ b/airflow/www/api/experimental/endpoints.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 from flask import (
 g, Blueprint, jsonify, request, url_for
 )

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/www/app.py
--
diff --git a/airflow/www/app.py b/airflow/www/app.py
index 15399ea..fa7949b 100644
--- a/airflow/www/app.py
+++ b/airflow/www/app.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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 

[04/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/contrib/operators/test_qubole_operator.py
--
diff --git a/tests/contrib/operators/test_qubole_operator.py 
b/tests/contrib/operators/test_qubole_operator.py
index 9b5bf3a..ad66f75 100644
--- a/tests/contrib/operators/test_qubole_operator.py
+++ b/tests/contrib/operators/test_qubole_operator.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 #
 
 import unittest

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/contrib/operators/test_s3_list_operator.py
--
diff --git a/tests/contrib/operators/test_s3_list_operator.py 
b/tests/contrib/operators/test_s3_list_operator.py
index e2e2b74..de95c76 100644
--- a/tests/contrib/operators/test_s3_list_operator.py
+++ b/tests/contrib/operators/test_s3_list_operator.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 import unittest
 

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/contrib/operators/test_s3_to_gcs_operator.py
--
diff --git a/tests/contrib/operators/test_s3_to_gcs_operator.py 
b/tests/contrib/operators/test_s3_to_gcs_operator.py
index 66c4531..807882c 100644
--- a/tests/contrib/operators/test_s3_to_gcs_operator.py
+++ b/tests/contrib/operators/test_s3_to_gcs_operator.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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. 

[15/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
[AIRFLOW-2287] Fix incorrect ASF headers

Closes #3219 from bolkedebruin/fix_header


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

Branch: refs/heads/master
Commit: c7a472ed6b0d8a4720f57ba1140c8cf665757167
Parents: b3c0ae0
Author: Bolke de Bruin 
Authored: Sat Apr 14 09:13:23 2018 +0200
Committer: Fokko Driesprong 
Committed: Sat Apr 14 09:13:23 2018 +0200

--
 .codecov.yml| 27 
 .coveragerc | 27 
 .editorconfig   | 27 
 .readthedocs.yml| 27 
 .travis.yml | 27 
 MANIFEST.in | 27 
 airflow/__init__.py | 27 
 airflow/alembic.ini | 27 
 airflow/api/__init__.py | 27 
 airflow/api/auth/__init__.py| 27 
 airflow/api/auth/backend/__init__.py| 27 
 airflow/api/auth/backend/default.py | 27 
 airflow/api/auth/backend/deny_all.py| 27 
 airflow/api/client/__init__.py  | 27 
 airflow/api/client/api_client.py| 27 
 airflow/api/client/json_client.py   | 27 
 airflow/api/client/local_client.py  | 27 
 airflow/api/common/__init__.py  | 27 
 airflow/api/common/experimental/__init__.py | 27 
 airflow/api/common/experimental/delete_dag.py   | 27 
 airflow/api/common/experimental/get_task.py | 27 
 .../common/experimental/get_task_instance.py| 27 
 airflow/api/common/experimental/mark_tasks.py   | 27 
 airflow/api/common/experimental/pool.py | 27 
 airflow/api/common/experimental/trigger_dag.py  | 27 
 airflow/bin/__init__.py | 27 
 airflow/bin/airflow | 27 
 airflow/bin/airflow_scheduler_autorestart.sh| 27 
 airflow/bin/cli.py  | 27 
 airflow/config_templates/__init__.py| 27 
 .../config_templates/airflow_local_settings.py  | 27 
 airflow/config_templates/default_airflow.cfg| 27 
 airflow/config_templates/default_celery.py  | 27 
 airflow/config_templates/default_test.cfg   | 27 
 .../default_webserver_config.py | 27 
 airflow/configuration.py| 27 
 airflow/contrib/__init__.py | 27 
 airflow/contrib/auth/__init__.py| 27 
 airflow/contrib/auth/backends/__init__.py   | 27 
 .../auth/backends/github_enterprise_auth.py | 27 
 airflow/contrib/auth/backends/google_auth.py| 27 
 airflow/contrib/auth/backends/kerberos_auth.py  | 27 
 airflow/contrib/auth/backends/ldap_auth.py  | 27 
 airflow/contrib/auth/backends/password_auth.py  | 27 
 .../example_dags/example_databricks_operator.py | 27 
 .../example_emr_job_flow_automatic_steps.py | 27 
 .../example_emr_job_flow_manual_steps.py| 27 
 ...enkins_job_trigger_operator.py.notexecutable | 27 
 .../contrib/example_dags/example_pubsub_flow.py | 27 
 .../example_dags/example_qubole_operator.py | 27 
 .../example_dags/example_qubole_sensor.py   | 27 
 .../contrib/example_dags/example_twitter_dag.py | 27 
 airflow/contrib/executors/__init__.py   | 27 
 airflow/contrib/executors/mesos_executor.py | 27 
 airflow/contrib/hooks/__init__.py   | 27 
 airflow/contrib/hooks/aws_dynamodb_hook.py  | 27 
 airflow/contrib/hooks/aws_hook.py   | 27 

[14/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/api/common/experimental/mark_tasks.py
--
diff --git a/airflow/api/common/experimental/mark_tasks.py 
b/airflow/api/common/experimental/mark_tasks.py
index e9366e0..74db1b4 100644
--- a/airflow/api/common/experimental/mark_tasks.py
+++ b/airflow/api/common/experimental/mark_tasks.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 from airflow.jobs import BackfillJob
 from airflow.models import DagRun, TaskInstance

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/api/common/experimental/pool.py
--
diff --git a/airflow/api/common/experimental/pool.py 
b/airflow/api/common/experimental/pool.py
index 6e963a2..7fb7586 100644
--- a/airflow/api/common/experimental/pool.py
+++ b/airflow/api/common/experimental/pool.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 from airflow.exceptions import AirflowException
 from airflow.models import Pool

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/api/common/experimental/trigger_dag.py
--
diff --git a/airflow/api/common/experimental/trigger_dag.py 
b/airflow/api/common/experimental/trigger_dag.py
index 9d9934d..7ff8184 100644
--- a/airflow/api/common/experimental/trigger_dag.py
+++ b/airflow/api/common/experimental/trigger_dag.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for 

[02/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/test_logging_config.py
--
diff --git a/tests/test_logging_config.py b/tests/test_logging_config.py
index 516f666..d6f1194 100644
--- a/tests/test_logging_config.py
+++ b/tests/test_logging_config.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 import os
 import shutil
 import sys

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/test_utils/__init__.py
--
diff --git a/tests/test_utils/__init__.py b/tests/test_utils/__init__.py
index 9d7677a..4067cc7 100644
--- a/tests/test_utils/__init__.py
+++ b/tests/test_utils/__init__.py
@@ -1,13 +1,18 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/test_utils/fake_datetime.py
--
diff --git a/tests/test_utils/fake_datetime.py 
b/tests/test_utils/fake_datetime.py
index a2856f6..42bb01d 100644
--- a/tests/test_utils/fake_datetime.py
+++ b/tests/test_utils/fake_datetime.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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 

[03/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/dags_with_system_exit/c_system_exit.py
--
diff --git a/tests/dags_with_system_exit/c_system_exit.py 
b/tests/dags_with_system_exit/c_system_exit.py
index 5644304..2581dfe 100644
--- a/tests/dags_with_system_exit/c_system_exit.py
+++ b/tests/dags_with_system_exit/c_system_exit.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 # Tests to make sure that a system exit won't cause the scheduler to fail.
 # Start with 'z' to get listed last.

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/executors/__init__.py
--
diff --git a/tests/executors/__init__.py b/tests/executors/__init__.py
index f694969..4e16cd0 100644
--- a/tests/executors/__init__.py
+++ b/tests/executors/__init__.py
@@ -1,15 +1,20 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 
 from .dask_executor import *

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/executors/dask_executor.py
--
diff --git a/tests/executors/dask_executor.py b/tests/executors/dask_executor.py
index 84c320c..eda7a86 100644
--- a/tests/executors/dask_executor.py
+++ b/tests/executors/dask_executor.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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"); 

[01/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
Repository: incubator-airflow
Updated Branches:
  refs/heads/master b3c0ae003 -> c7a472ed6


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/www_rbac/__init__.py
--
diff --git a/tests/www_rbac/__init__.py b/tests/www_rbac/__init__.py
index 9d7677a..4067cc7 100644
--- a/tests/www_rbac/__init__.py
+++ b/tests/www_rbac/__init__.py
@@ -1,13 +1,18 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/www_rbac/api/__init__.py
--
diff --git a/tests/www_rbac/api/__init__.py b/tests/www_rbac/api/__init__.py
index 9d7677a..4067cc7 100644
--- a/tests/www_rbac/api/__init__.py
+++ b/tests/www_rbac/api/__init__.py
@@ -1,13 +1,18 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/tests/www_rbac/api/experimental/__init__.py
--
diff --git a/tests/www_rbac/api/experimental/__init__.py 
b/tests/www_rbac/api/experimental/__init__.py
index 9d7677a..4067cc7 100644
--- a/tests/www_rbac/api/experimental/__init__.py
+++ b/tests/www_rbac/api/experimental/__init__.py
@@ -1,13 +1,18 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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 

[10/15] incubator-airflow git commit: [AIRFLOW-2287] Fix incorrect ASF headers

2018-04-14 Thread fokko
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/hooks/zendesk_hook.py
--
diff --git a/airflow/hooks/zendesk_hook.py b/airflow/hooks/zendesk_hook.py
index c504e4d..a8aee23 100644
--- a/airflow/hooks/zendesk_hook.py
+++ b/airflow/hooks/zendesk_hook.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 #
 import time
 from zdesk import Zendesk, RateLimitError, ZendeskError

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/jobs.py
--
diff --git a/airflow/jobs.py b/airflow/jobs.py
index 1911896..9754415 100644
--- a/airflow/jobs.py
+++ b/airflow/jobs.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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.
 #
 from __future__ import absolute_import
 from __future__ import division

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c7a472ed/airflow/logging_config.py
--
diff --git a/airflow/logging_config.py b/airflow/logging_config.py
index ccf1890..cf1a275 100644
--- a/airflow/logging_config.py
+++ b/airflow/logging_config.py
@@ -1,16 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# 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
-#
-# 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.
+# 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