You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/03/13 04:45:43 UTC

[45/45] incubator-airflow git commit: Merge branch 'v1-8-test' into v1-8-stable

Merge branch 'v1-8-test' into v1-8-stable


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

Branch: refs/heads/v1-8-stable
Commit: f4760c320a29be62469799355e76efa42d0b6bb2
Parents: 07d40d7 2a60897
Author: Bolke de Bruin <bo...@Bolkes-MacBook-Pro.local>
Authored: Sun Mar 12 19:56:48 2017 -0700
Committer: Bolke de Bruin <bo...@Bolkes-MacBook-Pro.local>
Committed: Sun Mar 12 19:56:48 2017 -0700

----------------------------------------------------------------------
 .github/PULL_REQUEST_TEMPLATE.md                |   6 +-
 CHANGELOG.txt                                   |  35 +-
 airflow/__init__.py                             |   8 +-
 airflow/api/client/local_client.py              |   2 +-
 airflow/bin/cli.py                              |   9 +-
 airflow/configuration.py                        |   8 +-
 airflow/contrib/auth/backends/ldap_auth.py      |  26 +-
 airflow/contrib/hooks/__init__.py               |   1 +
 airflow/contrib/hooks/gcp_dataflow_hook.py      |  33 +-
 airflow/contrib/hooks/spark_submit_hook.py      | 226 ++++++++++
 airflow/contrib/operators/__init__.py           |   1 +
 airflow/contrib/operators/dataflow_operator.py  |  85 +++-
 .../contrib/operators/spark_submit_operator.py  | 112 +++++
 .../contrib/operators/ssh_execute_operator.py   |   2 +-
 airflow/hooks/postgres_hook.py                  |  19 +-
 airflow/jobs.py                                 | 437 ++++++++++---------
 airflow/migrations/env.py                       |   6 +-
 airflow/models.py                               |  85 +++-
 airflow/operators/dagrun_operator.py            |   3 +-
 airflow/operators/s3_to_hive_operator.py        | 151 +++++--
 airflow/operators/sensors.py                    |   4 +-
 airflow/plugins_manager.py                      |   4 +-
 airflow/ti_deps/deps/trigger_rule_dep.py        |   6 +-
 airflow/utils/compression.py                    |  38 ++
 airflow/utils/db.py                             |   8 +-
 airflow/version.py                              |   2 +-
 airflow/www/utils.py                            |   4 +-
 airflow/www/views.py                            |  30 +-
 run_unit_tests.sh                               |  36 +-
 tests/contrib/hooks/gcp_dataflow_hook.py        |  56 +++
 tests/contrib/hooks/spark_submit_hook.py        | 148 +++++++
 tests/contrib/operators/dataflow_operator.py    |  76 ++++
 .../contrib/operators/spark_submit_operator.py  |  75 ++++
 tests/core.py                                   |  28 +-
 tests/dags/test_dagrun_short_circuit_false.py   |  38 ++
 tests/dags/test_double_trigger.py               |  29 ++
 tests/dags/test_issue_1225.py                   |  13 +
 tests/executor/__init__.py                      |  13 -
 tests/executor/test_executor.py                 |  33 --
 tests/executors/__init__.py                     |  13 +
 tests/executors/test_executor.py                |  56 +++
 tests/jobs.py                                   | 218 ++++++++-
 tests/models.py                                 | 173 +++++++-
 tests/operators/__init__.py                     |   1 +
 tests/operators/s3_to_hive_operator.py          | 247 +++++++++++
 tests/operators/subdag_operator.py              |   4 +-
 tests/utils/__init__.py                         |   1 +
 tests/utils/compression.py                      |  97 ++++
 48 files changed, 2280 insertions(+), 426 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f4760c32/airflow/version.py
----------------------------------------------------------------------
diff --cc airflow/version.py
index c280ed0,8f87df9..cdbe073
--- a/airflow/version.py
+++ b/airflow/version.py
@@@ -13,4 -13,4 +13,4 @@@
  # limitations under the License.
  #
  
- version = '1.8.0rc4+apache.incubating'
 -version = '1.8.1alpha0'
++version = '1.8.0rc5+apache.incubating'