[Swan-commit] Changes to ref refs/heads/master

[Andrew Cagney]

New commits:
commit fe127706497fbde61ab865b86a492f6595b542e8
Merge: a7172c4 4a21eec
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Dec 26 22:27:23 2018 -0500

    testing: cleanup IKEv1 vs IKEv2 fallout, so tests can pass again
    
    - redundant ikev1=no ikev1=never
    - duplicate ikev2=no
    - redundant --ikev2-allow --ikev2-insist
    - incorrect ikev2=no
    
    Merge commit '4a21eec4a16526ddd4846f2ad8c2dc35b8b4a95d'

commit 4a21eec4a16526ddd4846f2ad8c2dc35b8b4a95d
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Dec 26 16:12:35 2018 -0500

    restore: testing: delete some stray ikev2=never lines
    
    The tests were failing because the config file contains
    both ikev2=no ikev2=never lines.
    
    With the redundant line removed, the tests pass - an IKEv1
    association is established as expected.
    
    This reverts commit 2232f43c8523d46db4b12a06090c8bbbf94481b2.

commit 45ddb0a86a4ed2ad9672ef36b6eab2335f7fb23f
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Dec 26 22:05:53 2018 -0500

    testing: merge --ikev2-allow --ikev2-insist into --ikev2-allow
    
    (although --ikev2 would have been nicer)

commit 6dc2bf0975be6a8011a4876ec7c99331723ccade
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Dec 26 21:51:37 2018 -0500

    testing: remove added ikev2=no when test output expects ikev2

commit 5dac849452108d98432ba05e668cef3a9e22a460
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Dec 26 21:00:38 2018 -0500

    testing: drop some redundant ikev1=no lines