File tree Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -115,8 +115,13 @@ dep_cowboy = hex 2.8.0
115
115
dep_cowlib = hex 2.9.1
116
116
dep_jsx = hex 3.1.0
117
117
dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
118
+ <<<<<<< HEAD
118
119
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl 06425c21a39c1564164f1cc3fe5bdfa8b23b1f78
119
120
dep_ra = hex 2.0.6
121
+ ====== =
122
+ dep_prometheus = hex 4.8.2
123
+ dep_ra = git https://github.com/rabbitmq/ra.git main
124
+ >>>>>>> 2a24662127 (Update Prometheus.erl to 4.8.2)
120
125
dep_ranch = hex 2.1.0
121
126
dep_recon = hex 2.5.2
122
127
dep_redbug = hex 2.0.7
Original file line number Diff line number Diff line change @@ -172,12 +172,9 @@ erlang_app(
172
172
remote = "https://github.com/rabbitmq/osiris.git" ,
173
173
)
174
174
175
- github_erlang_app (
175
+ hex_pm_erlang_app (
176
176
name = "prometheus" ,
177
- repo = "prometheus.erl" ,
178
- org = "deadtrickster" ,
179
- ref = "06425c21a39c1564164f1cc3fe5bdfa8b23b1f78" ,
180
- version = "06425c21a39c1564164f1cc3fe5bdfa8b23b1f78" ,
177
+ version = "4.8.2" ,
181
178
first_srcs = [
182
179
"src/prometheus_collector.erl" ,
183
180
"src/prometheus_format.erl" ,
@@ -187,6 +184,7 @@ erlang_app(
187
184
deps = [
188
185
"@quantile_estimator//:erlang_app" ,
189
186
],
187
+ sha256 = "c3abd6521e52cec4f0d8eca603cf214dfc84d8a27aa85946639f1424b8554d98" ,
190
188
)
191
189
192
190
github_erlang_app (
You can’t perform that action at this time.
0 commit comments