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

[Paul Wouters]

New commits:
commit f1c2e586c33da8928294f5e55ccdbc16fece7e5e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Sep 22 19:15:27 2016 -0400

    IKEv1: remove all cases where we disallowed combinations of NAT-T and encaps

commit afd5c63f08c1a9dc2e872c8bae4f76bf0d999158
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Sep 22 19:13:39 2016 -0400

    libipsecconf: obsolete forceencaps - don't alias it to encaps
    
    This alias was a little tricky, as forceencaps=no really equals
    encaps=auto and not encaps=no. So it is better to ignore forceencaps=no.
    
    It does break forceencaps=yes on upgrade, but we do issue a warning
    about the option.

commit 6b0c310c2aa6535ea1ecb8c1c417ffaeec5d6b12
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Sep 22 19:13:06 2016 -0400

    libipsecconf: set default encaps to encaps_auto

commit f47a21f1f73a330f55818c76d308f6a78c026170
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Sep 22 19:12:28 2016 -0400

    testing: updated nat-pluto-03 to show encap status in final.sh