From 4bc3c2f50c827c12becd0f9cd06fd92347bc90c2 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Fri, 18 Oct 2019 08:46:53 +0200
Subject: [PATCH 1/2] [AIRFLOW-5688] Merge alembic migrations

$ alembic branches
939bb1e647c8 (branchpoint)
             -> 6e96a59344a4
             -> 004c1210f153 (head)

c8ffec048a3b (branchpoint)
             -> dd4ecb8fbee3
             -> a56c9515abdc

41f5f12752f8 (branchpoint)
             -> c8ffec048a3b (branchpoint)
             -> cf5dc11e79ad

9635ae0956e7 (branchpoint)
             -> dd25f486b8ea
             -> 0a2a5b66e19d

d2ae31099d61 (branchpoint)
             -> 33ae817a1ff4
             -> 0e2a74e0fc9f

$ alembic heads
004c1210f153 (head)
74effc47d867 (head)
---
 ...60b_merge_004c1210f153_and_74effc47d867.py | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py

diff --git a/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py b/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py
new file mode 100644
index 0000000000000..40c295b9de1c0
--- /dev/null
+++ b/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py
@@ -0,0 +1,45 @@
+#
+# 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.
+
+"""merge 004c1210f153 and 74effc47d867
+
+Revision ID: b0125267960b
+Revises: 004c1210f153, 74effc47d867
+Create Date: 2019-10-18 08:45:11.598735
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'b0125267960b'
+down_revision = ('004c1210f153', '74effc47d867')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    """Apply merge 004c1210f153 and 74effc47d867"""
+    pass
+
+
+def downgrade():
+    """Unapply merge 004c1210f153 and 74effc47d867"""
+    pass

From cd3a287924efdb6f9f3b9566e38bcf4dd50c83c9 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Fri, 18 Oct 2019 09:58:23 +0200
Subject: [PATCH 2/2] Make pylint happy

---
 .../b0125267960b_merge_004c1210f153_and_74effc47d867.py       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py b/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py
index 40c295b9de1c0..0e9065c4223cf 100644
--- a/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py
+++ b/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py
@@ -24,10 +24,6 @@
 
 """
 
-from alembic import op
-import sqlalchemy as sa
-
-
 # revision identifiers, used by Alembic.
 revision = 'b0125267960b'
 down_revision = ('004c1210f153', '74effc47d867')