Merge branch '1522'

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

Branch: refs/heads/master
Commit: 5e40d9858d293b5116e5e668414a710cde06104e
Parents: 4b78e1a 0b3d101
Author: Dan Davydov <dan.davy...@airbnb.com>
Authored: Thu May 19 11:12:13 2016 -0700
Committer: Dan Davydov <dan.davy...@airbnb.com>
Committed: Thu May 19 11:12:13 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.txt       | 238 +++++++++++++++++++++++++++++++++++++++++------
 airflow/__init__.py |   2 +-
 setup.py            |   2 +-
 3 files changed, 214 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/5e40d985/setup.py
----------------------------------------------------------------------
diff --cc setup.py
index 4d596ee,305ab67..43fefd8
--- a/setup.py
+++ b/setup.py
@@@ -5,10 -4,8 +5,10 @@@ import loggin
  import os
  import sys
  
 +logger = logging.getLogger(__name__)
 +
  # Kept manually in sync with airflow.__version__
- version = '1.7.0'
+ version = '1.7.1'
  
  
  class Tox(TestCommand):

Reply via email to