Skip to content

Commit 87f30f5

Browse files
kjnilssonmergify[bot]
authored andcommitted
Osiris 1.7.1
(cherry picked from commit 81a57fe) # Conflicts: # MODULE.bazel
1 parent 8d7cc32 commit 87f30f5

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@ bazel_dep(
4343

4444
bazel_dep(
4545
name = "rabbitmq_osiris",
46+
<<<<<<< HEAD
4647
<<<<<<< HEAD
4748
version = "1.6.9",
4849
=======
4950
version = "1.7.0",
5051
>>>>>>> cb27208c06 (Osiris 1.7.0)
52+
=======
53+
version = "1.7.1",
54+
>>>>>>> 81a57feb6b (Osiris 1.7.1)
5155
repo_name = "osiris",
5256
)
5357

deps/rabbit/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck prop
147147
PLT_APPS += mnesia
148148

149149
dep_syslog = git https://github.com/schlagert/syslog 4.0.0
150-
dep_osiris = git https://github.com/rabbitmq/osiris v1.7.0
150+
dep_osiris = git https://github.com/rabbitmq/osiris v1.7.1
151151
dep_systemd = hex 0.6.1
152152
dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
153153

0 commit comments

Comments
 (0)