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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=157c2fc0e13a5b801af1c146eb00049061a6a075
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

157c2fc by Guy Harris (guy@xxxxxxxxxxxx):

    Fix from the Samba repository:
    
      Author: Aurelien Aptel <aaptel@xxxxxxxx>
      Date:   Wed May 18 14:23:56 2016 +0200
    
        pidl/ws: fix failing tests
    
        This commit fixes 2 test failures in Pidl test suite.
    
        - commit 02cd7808 changed the error the test was expecting
          => update expected output in the test
        - commit c76b65e changed whitespaces in the output
          => revert to the old output in the generator
    
        Signed-off-by: Aurelien Aptel <aaptel@xxxxxxxx>
        Reviewed-by: Stefan Metzmacher <metze@xxxxxxxxx>
        Reviewed-by: David Disseldorp <ddiss@xxxxxxxxx>
    
    Change-Id: I142d4ae405edfff760c00b95e0475502a1eac2f0
    Reviewed-on: https://code.wireshark.org/review/16734
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  93d5df4   If we don't get any OS information, remove the old OS information.
    adds  157c2fc   Fix from the Samba repository:


Summary of changes:
 tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm |    5 ++---
 tools/pidl/tests/wireshark-conf.pl         |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)