Merge branch '1503'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/db07e04f Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/db07e04f Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/db07e04f Branch: refs/heads/master Commit: db07e04f97f34bc43fccc238291d22253b85316d Parents: 72ab63e 199e07a Author: Dan Davydov <dan.davy...@airbnb.com> Authored: Mon May 16 13:15:49 2016 -0700 Committer: Dan Davydov <dan.davy...@airbnb.com> Committed: Mon May 16 13:15:49 2016 -0700 ---------------------------------------------------------------------- airflow/hooks/druid_hook.py | 23 ++++++++++++++++------- airflow/operators/hive_to_druid.py | 8 +++++--- 2 files changed, 21 insertions(+), 10 deletions(-) ----------------------------------------------------------------------