From 0f3e6bd1f6c5aa16a3911f2c87d1cfea5676acfe Mon Sep 17 00:00:00 2001
From: TivonB-AI2 <124182151+TivonB-AI2@users.noreply.github.com>
Date: Thu, 1 Aug 2024 05:14:35 -0400
Subject: [PATCH 1/2] Resolve conflict in cherry-pick of
 c05f9f321598b3e41296debb0a6e469c0fa89c9f and change the commit message

---
 integrations/Gemfile.lock                                     | 4 ++++
 .../destination/databricks_lakehouse/config/meta.json         | 4 ++--
 .../destination/databricks_lakehouse/config/spec.json         | 2 +-
 integrations/lib/multiwoven/integrations/rollout.rb           | 4 ++++
 .../integrations/source/databricks/config/spec.json           | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index fb0b8ee2..49bc10da 100644
--- a/integrations/Gemfile.lock
+++ b/integrations/Gemfile.lock
@@ -7,7 +7,11 @@ GIT
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
     multiwoven-integrations (0.5.2)
+=======
+    multiwoven-integrations (0.7.1)
+>>>>>>> c05f9f32 (chore(CE): change name to databricks datawarehouse (#340))
       activesupport
       async-websocket
       aws-sdk-athena
diff --git a/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/meta.json b/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/meta.json
index 6849247c..34e949ea 100644
--- a/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/meta.json
+++ b/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/meta.json
@@ -1,9 +1,9 @@
 {
   "data": {
     "name": "DatabricksLakehouse",
-    "title": "Databricks Lakehouse",
+    "title": "Databricks Datawarehouse",
     "connector_type": "destination",
-    "category": "Marketing Automation",
+    "category": "Database",
     "documentation_url": "https://docs.multiwoven.com/destinations/databricks_lakehouse",
     "github_issue_label": "destination-databricks-lakehouse",
     "icon": "icon.svg",
diff --git a/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/spec.json b/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/spec.json
index bbd4f497..5693add1 100644
--- a/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/spec.json
+++ b/integrations/lib/multiwoven/integrations/destination/databricks_lakehouse/config/spec.json
@@ -3,7 +3,7 @@
   "stream_type": "static",
   "connection_specification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Databricks Lakehouse",
+    "title": "Databricks Datawarehouse",
     "type": "object",
     "required": ["host", "api_token", "warehouse_id", "catalog", "schema"],
     "properties": {
diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index 76ece7b2..3c9fdd87 100644
--- a/integrations/lib/multiwoven/integrations/rollout.rb
+++ b/integrations/lib/multiwoven/integrations/rollout.rb
@@ -2,7 +2,11 @@
 
 module Multiwoven
   module Integrations
+<<<<<<< HEAD
     VERSION = "0.5.2"
+=======
+    VERSION = "0.7.1"
+>>>>>>> c05f9f32 (chore(CE): change name to databricks datawarehouse (#340))
 
     ENABLED_SOURCES = %w[
       Snowflake
diff --git a/integrations/lib/multiwoven/integrations/source/databricks/config/spec.json b/integrations/lib/multiwoven/integrations/source/databricks/config/spec.json
index e446ffe3..9d5ff33d 100644
--- a/integrations/lib/multiwoven/integrations/source/databricks/config/spec.json
+++ b/integrations/lib/multiwoven/integrations/source/databricks/config/spec.json
@@ -4,7 +4,7 @@
     "connector_query_type": "raw_sql",
     "connection_specification": {
       "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "Databricks",
+      "title": "Databricks Datawarehouse",
       "type": "object",
       "required": ["host", "port", "http_path", "catalog", "schema"],
       "properties": {

From 7af476ed0e40a99464587c1d8a17308eedc4e3bf Mon Sep 17 00:00:00 2001
From: afthab vp <afthab01@gmail.com>
Date: Fri, 2 Aug 2024 15:00:56 +0530
Subject: [PATCH 2/2] fix(CE): rollout version changes

---
 integrations/lib/multiwoven/integrations/rollout.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index 45d2b8b2..dd0b7129 100644
--- a/integrations/lib/multiwoven/integrations/rollout.rb
+++ b/integrations/lib/multiwoven/integrations/rollout.rb
@@ -2,7 +2,7 @@
 
 module Multiwoven
   module Integrations
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
 
     ENABLED_SOURCES = %w[
       Snowflake