From 34498027378ed05213e119504d7327f2c6b93d6c Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Sat, 8 May 2021 07:59:44 +1200
Subject: [PATCH] docs(UPDATING): Adding downtime for #14234 (#14513)

---
 UPDATING.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/UPDATING.md b/UPDATING.md
index d6c43e39a7093..8a07e97a753da 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -24,6 +24,15 @@ assists people when migrating to a new version.
 
 ## 1.2.0
 
+<<<<<<< HEAD
+=======
+- [14255](https://github.com/apache/superset/pull/14255): The default `CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC` callable logic has been updated to leverage the specified database and schema to ensure the upload S3 key prefix is unique. Previously tables generated via upload from CSV with the same name but differ schema and/or cluster would use the same S3 key prefix. Note this change does not impact previously imported tables.
+
+### Breaking Changes
+### Potential Downtime
+- [14234](https://github.com/apache/superset/pull/14234): Adds the `limiting_factor` column to the `query` table. Give the migration includes a DDL operation on a heavily trafficed table, potential service downtime may be required.
+
+>>>>>>> 6871ad15f... docs(UPDATING): Adding downtime for #14234 (#14513)
 ### Deprecations
 
 - [13440](https://github.com/apache/superset/pull/13440): Dashboard/Charts reports and old Alerts is deprecated. The following config keys are deprecated: