Resolve conflict in cherry-pick of 27c4c0e45853349f46179435d764cbd794…

…2e44d1 and change the commit message
Multiwoven · Aug 15, 2024 · c4a51f3 · c4a51f3
1 parent 13c17f9
commit c4a51f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/integrations/Gemfile b/integrations/Gemfile
@@ -67,7 +67,7 @@ gem "mysql2"
 
 gem "aws-sdk-sts"
 
-gem "ruby-oci8"
+gem "ruby-oci8", "~> 2.2.12"
 
 group :development, :test do
   gem "simplecov", require: false

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
@@ -7,7 +7,11 @@ GIT
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
     multiwoven-integrations (0.7.9)
+=======
+    multiwoven-integrations (0.8.1)
+>>>>>>> 27c4c0e4 (chore(CE): fix oci8 version (#375))
       activesupport
       async-websocket
       aws-sdk-athena
@@ -360,7 +364,7 @@ DEPENDENCIES
   rspec (~> 3.0)
   rubocop (~> 1.21)
   ruby-limiter
-  ruby-oci8
+  ruby-oci8 (~> 2.2.12)
   ruby-odbc!
   rubyzip
   sequel

diff --git 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.7.9"
+=======
+    VERSION = "0.8.1"
+>>>>>>> 27c4c0e4 (chore(CE): fix oci8 version (#375))
 
     ENABLED_SOURCES = %w[
       Snowflake