Merge branch 'master' into temp_fix

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

Branch: refs/heads/master
Commit: f939d78328c926d8e2b29dbe0a3e39ca394b3da0
Parents: 6948e40 e9fe64a
Author: Bolke de Bruin <[email protected]>
Authored: Tue Jan 3 14:27:12 2017 +0100
Committer: Bolke de Bruin <[email protected]>
Committed: Tue Jan 3 14:27:12 2017 +0100

----------------------------------------------------------------------
 scripts/perf/dags/perf_dag_1.py       |  45 +++++++
 scripts/perf/dags/perf_dag_2.py       |  45 +++++++
 scripts/perf/scheduler_ops_metrics.py | 187 +++++++++++++++++++++++++++++
 3 files changed, 277 insertions(+)
----------------------------------------------------------------------


Reply via email to