Skip to content

Commit bae0af6

Browse files
andselmergify[bot]
authored andcommitted
Update uri gem required by Logstash (#17495)
(cherry picked from commit cb4c234) # Conflicts: # Gemfile.template
1 parent 8cac9d0 commit bae0af6

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Diff for: Gemfile.template

+5
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,8 @@ gem "thwait"
4646
gem "bigdecimal", "~> 3.1"
4747

4848
gem "psych", "5.2.2"
49+
<<<<<<< HEAD
50+
=======
51+
gem "cgi", "0.3.7" # Pins until a new jruby version with updated cgi is released
52+
gem "uri", "0.12.3" # Pins until a new jruby version with updated cgi is released
53+
>>>>>>> cb4c234a (Update uri gem required by Logstash (#17495))

0 commit comments

Comments
 (0)