March 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: layer23/{mobile,modem}: prefix VTY prompt with projetc's name
by fixeria 16 Mar '23

16 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31946 ) Change subject: layer23/{mobile,modem}: prefix VTY prompt with projetc's name ...................................................................... layer23/{mobile,modem}: prefix VTY prompt with projetc's name Change-Id: If7ce89362c75e2c15995dfb08cfcfdcad24e2529 --- M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/modem/app_modem.c 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/31946/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a61774b..a0d2546 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -491,7 +491,7 @@ } static struct vty_app_info _mobile_vty_info = { - .name = "mobile", + .name = "OsmocomBB(mobile)", .version = PACKAGE_VERSION, }; diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index d9d40cd..cecf4e6 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -186,7 +186,7 @@ } static struct vty_app_info _modem_vty_info = { - .name = "modem", + .name = "OsmocomBB(modem)", .version = PACKAGE_VERSION, .go_parent_cb = modem_vty_go_parent, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If7ce89362c75e2c15995dfb08cfcfdcad24e2529 Gerrit-Change-Number: 31946 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: layer23/{mobile,modem}: fix segfault on VTY connection
by fixeria 16 Mar '23

16 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31945 ) Change subject: layer23/{mobile,modem}: fix segfault on VTY connection ...................................................................... layer23/{mobile,modem}: fix segfault on VTY connection It was a mistake to call vty_init(), passing it a pointer to the vty_app_info structure allocated on the stack, because it gets overwritten when the calling function _vty_init() returns. Change-Id: I75843a964254243c70bedcf8ff97d854107ee21a Fixes: 9feb5057 "layer23: refactor the application API concept" --- M src/host/layer23/include/osmocom/bb/common/l23_app.h M src/host/layer23/src/common/main.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c M src/host/layer23/src/modem/app_modem.c 5 files changed, 21 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/31945/1 diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h b/src/host/layer23/include/osmocom/bb/common/l23_app.h index fd8c877..6cf0b7e 100644 --- a/src/host/layer23/include/osmocom/bb/common/l23_app.h +++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h @@ -60,7 +60,7 @@ struct l23_app_info { const char *copyright; const char *contribution; - const struct vty_app_info *vty_info; /* L23_OPT_VTY */ + struct vty_app_info *vty_info; /* L23_OPT_VTY */ char *getopt_string; uint32_t opt_supported; /* mask of L23_OPT_* */ diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index e4a15ee..567b2e0 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -203,14 +203,12 @@ static int _vty_init(void) { - struct vty_app_info info; int rc; OSMO_ASSERT(l23_app_info.vty_info != NULL); - info = *l23_app_info.vty_info; - info.tall_ctx = l23_ctx; + l23_app_info.vty_info->tall_ctx = l23_ctx; - vty_init(&info); + vty_init(l23_app_info.vty_info); logging_vty_add_cmds(); if (l23_app_info.vty_init != NULL) diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a3b36e3..a61774b 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -490,7 +490,7 @@ return ms_vty_init(); } -static const struct vty_app_info _mobile_vty_info = { +static struct vty_app_info _mobile_vty_info = { .name = "mobile", .version = PACKAGE_VERSION, }; diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index d24a802..eca082a 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -217,14 +217,12 @@ static int _vty_init(void) { - struct vty_app_info info; int rc; OSMO_ASSERT(l23_app_info.vty_info != NULL); - info = *l23_app_info.vty_info; - info.tall_ctx = l23_ctx; + l23_app_info.vty_info->tall_ctx = l23_ctx; - vty_init(&info); + vty_init(l23_app_info.vty_info); logging_vty_add_cmds(); if (l23_app_info.vty_init != NULL) diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 58328c2..d9d40cd 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -185,7 +185,7 @@ return 0; } -static const struct vty_app_info _modem_vty_info = { +static struct vty_app_info _modem_vty_info = { .name = "modem", .version = PACKAGE_VERSION, .go_parent_cb = modem_vty_go_parent, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I75843a964254243c70bedcf8ff97d854107ee21a Gerrit-Change-Number: 31945 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
by fixeria 16 Mar '23

16 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... Patch Set 6: (2 comments) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/f8361601_68d8d1fb PS1, Line 173: rlcmac_prim_l1ctl_alloc > ... […] We can live with passing dummy arguments for now. File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/ef2939fb_5850eb86 PS4, Line 171: if (ind->usf != 0xff) { > You still need to send RTS.ind in conditions where usf doesn't match any UL TBF. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Mar 2023 12:58:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: add test VTY command for sending raw LLC PDUs
by fixeria 16 Mar '23

16 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31657 ) Change subject: modem: add test VTY command for sending raw LLC PDUs ...................................................................... Patch Set 4: Code-Review+2 (1 comment) File src/host/layer23/src/modem/vty.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31657/comment/3fef8b11_ed483c1f PS1, Line 90: "test MS_NAME llc unitdata-req <0x00-0xffffffff> SAPI HEXSTRING", > isn't the TLLI initially generated automatically by the MS? maybe simply do so and assign it to the […] It's a command for sending raw llc primitives, so I think it's fine to let the user specify TLLI. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I14f58e715d77a1b1cb40fdd3ddd09084360f2274 Gerrit-Change-Number: 31657 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Mar 2023 12:57:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: add test VTY command to send CHANNEL REQUEST
by fixeria 16 Mar '23

16 Mar '23

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31656 ) Change subject: modem: add test VTY command to send CHANNEL REQUEST ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I049a8d7f58ae9703d06dff235973ba376702c873 Gerrit-Change-Number: 31656 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Mar 2023 12:55:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XL] Change in osmocom-bb[master]: {trxcon,virt_phy}: shared GPRS L1 (MAC) implementation
by fixeria 16 Mar '23

16 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30743 ) Change subject: {trxcon,virt_phy}: shared GPRS L1 (MAC) implementation ...................................................................... Patch Set 10: (6 comments) File src/host/trxcon/include/osmocom/bb/l1gprs/l1gprs.h: https://gerrit.osmocom.org/c/osmocom-bb/+/30743/comment/a0d6be5c_12e7c52a PS6, Line 11: struct l1gprs_ul_tbf { > you are not storing tbf_nr here? Done https://gerrit.osmocom.org/c/osmocom-bb/+/30743/comment/c182e374_2bbf8b48 PS6, Line 16: struct l1gprs_dl_tbf { > same here. […] Done File src/host/trxcon/src/gprs.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30743/comment/76728113_22e03602 PS6, Line 116: .slotmask = req->slotmask, > .tbf_nr = , Done https://gerrit.osmocom.org/c/osmocom-bb/+/30743/comment/ed6f55fe_d0e2465a PS6, Line 125: pdch->ul_tbf_mask |= (1 << req->tbf_nr); > you are assuming really small values of tbf_nr here, which doesn't necessarily need to be the case. […] Done https://gerrit.osmocom.org/c/osmocom-bb/+/30743/comment/3c8e86dc_49d35ffe PS6, Line 167: tbf = &gprs->dl_tbf[req->tbf_nr]; > this needs to be a llist (due to potentially high tbf_nr ids). Done https://gerrit.osmocom.org/c/osmocom-bb/+/30743/comment/871dd056_3dbc2b5c PS6, Line 262: for (unsigned int i = 0; i < ARRAY_SIZE(gprs->dl_tbf); i++) { > If you regenerate the bitmask I talked about above each time a TBF is configured, then in here you c […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9567d64f9d00262e36147e8d7e541e5e246bda5f Gerrit-Change-Number: 30743 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Mar 2023 12:53:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
by fixeria 16 Mar '23

16 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 to look at the new patch set (#6). Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... modem: route L1CTL prims to/from libosmo-gprs-rlcmac Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Related: OS#5500 --- M src/host/layer23/src/modem/rlcmac.c 1 file changed, 74 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/31572/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmocom-bb[master]: layer23: implement Rx/Tx API for GPRS related messages
by fixeria 16 Mar '23

16 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/31571 to look at the new patch set (#6). Change subject: layer23: implement Rx/Tx API for GPRS related messages ...................................................................... layer23: implement Rx/Tx API for GPRS related messages Change-Id: I87950e893ef96ff8328f43f1548111aa9f66439b Related: OS#5500 --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/src/common/l1ctl.c 3 files changed, 127 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/71/31571/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I87950e893ef96ff8328f43f1548111aa9f66439b Gerrit-Change-Number: 31571 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[XL] Change in osmocom-bb[master]: {trxcon,virt_phy}: shared GPRS L1 (MAC) implementation
by fixeria 16 Mar '23

16 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30743 to look at the new patch set (#10). Change subject: {trxcon,virt_phy}: shared GPRS L1 (MAC) implementation ...................................................................... {trxcon,virt_phy}: shared GPRS L1 (MAC) implementation Change-Id: I9567d64f9d00262e36147e8d7e541e5e246bda5f Related: OS#5500 --- M include/l1ctl_proto.h A include/l1gprs.h M src/host/trxcon/include/osmocom/bb/Makefile.am A src/host/trxcon/include/osmocom/bb/l1gprs.h M src/host/trxcon/include/osmocom/bb/trxcon/logging.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h M src/host/trxcon/src/Makefile.am M src/host/trxcon/src/l1ctl.c A src/host/trxcon/src/l1gprs.c M src/host/trxcon/src/logging.c M src/host/trxcon/src/trxcon_fsm.c M src/host/trxcon/src/trxcon_inst.c M src/host/virt_phy/include/osmocom/bb/Makefile.am A src/host/virt_phy/include/osmocom/bb/l1gprs.h M src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h M src/host/virt_phy/include/osmocom/bb/virtphy/logging.h M src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h M src/host/virt_phy/src/Makefile.am M src/host/virt_phy/src/gsmtapl1_if.c M src/host/virt_phy/src/l1ctl_sap.c A src/host/virt_phy/src/l1gprs.c M src/host/virt_phy/src/logging.c A src/host/virt_phy/src/virt_prim_pdch.c M src/host/virt_phy/src/virtphy.c A src/shared/l1gprs.c 26 files changed, 868 insertions(+), 292 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/43/30743/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9567d64f9d00262e36147e8d7e541e5e246bda5f Gerrit-Change-Number: 30743 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ci[master]: obs: add --git-skip-checkout argument
by osmith 16 Mar '23

16 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31934 ) Change subject: obs: add --git-skip-checkout argument ...................................................................... obs: add --git-skip-checkout argument Prepare to use this for wireshark, to build a branch on-the-fly that does not get pushed to origin, with Osmocom patches on top of upstream master. Related: OS#2537 Change-Id: Ifc963daf51ba3542f67420daaf7b29745404a92e --- M scripts/obs/lib/__init__.py M scripts/obs/lib/git.py 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index edf19f4..675bcec 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -36,6 +36,9 @@ parser.add_argument("-s", "--git-skip-fetch", help="do not fetch already cloned git repositories", action="store_false", dest="git_fetch") + parser.add_argument("-S", "--git-skip-checkout", + help="do not checkout and reset to a branch/tag", + action="store_false", dest="git_checkout") parser.add_argument("-m", "--meta", action="store_true", help="build a meta package (e.g. osmocom-nightly)") parser.add_argument("-i", "--ignore-req", action="store_true", diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py index f1ee98d..15cb276 100644 --- a/scripts/obs/lib/git.py +++ b/scripts/obs/lib/git.py @@ -53,6 +53,11 @@ def checkout(project, branch): repo_path = get_repo_path(project) + if not lib.args.git_checkout: + ref = lib.run_cmd(["git", "log", "--pretty=oneline", "--abbrev-commit", + "-1"], cwd=repo_path).output.rstrip() + print(f"{project}: skipping git checkout, current commit: {ref}") + return print(f"{project}: 'git checkout -f {branch}'") lib.run_cmd(["git", "checkout", "-f", branch], cwd=repo_path) print(f"{project}: 'git reset --hard {branch}'") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifc963daf51ba3542f67420daaf7b29745404a92e Gerrit-Change-Number: 31934 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0