[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4b9a4bcb740f15694fb82eac7cb1e31e8f7629ec
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

4b9a4bc by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Add obsolete ssl[._]port preferences.
    
    gcd95e197ca renamed a bunch of "<proto>.ssl.port" preferences to
    "<proto>.tls.port" but neglected to add obsolete entries for the old
    preferences. Do so here.
    
    Rename couchbase.tls_port to couchbase.tls.port to be in line with the
    other TLS port preferences.
    
    Change-Id: Ie23d6be0a5cb3616f37e41dbfbf13ad1b7206473
    Reviewed-on: https://code.wireshark.org/review/29829
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  42c9bee   Flag invalid markers.
     add  4b9a4bc   Add obsolete ssl[._]port preferences.


Summary of changes:
 epan/dissectors/asn1/ldap/packet-ldap-template.c | 1 +
 epan/dissectors/packet-amqp.c                    | 1 +
 epan/dissectors/packet-couchbase.c               | 3 ++-
 epan/dissectors/packet-http.c                    | 1 +
 epan/dissectors/packet-ldap.c                    | 3 ++-
 epan/dissectors/packet-opa-fe.c                  | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)