Wireshark-commits: [Wireshark-commits] master 05e37a3: Lustre: Fix conflict

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 04 Nov 2019 11:27:18 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=05e37a386ee68a0decd48c03f4aad39ead6bc341
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

05e37a3 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    Lustre: Fix conflict
    
    'lustre.mdt_rec_reint.size' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'lustre.ldlm_res_id.name' exists multiple times with NOT compatible types: FT_STRING and FT_UINT64
    
    Change-Id: I2706ac7c9866e4b435e6bd3c235fb67f1833af70
    Reviewed-on: https://code.wireshark.org/review/34909
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  b6c31d5   RTCP: fix an infinite loop (CID 1455251)
     add  05e37a3   Lustre: Fix conflict


Summary of changes:
 epan/dissectors/packet-lustre.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)