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

[Andrew Cagney]

New commits:
commit de4ca55cd190be78c8ceae9fecfb38e14366d7cb
Merge: 0b70968 cfe64d8
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Jan 9 11:03:08 2019 -0500

    state: replace remaining uses of st_ikev2 with .st_ike_version [=!]= IKEv[12]
    
    Merge commit 'cfe64d8a3df92738c1aacdb100a33106545673ce'

commit cfe64d8a3df92738c1aacdb100a33106545673ce
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Jan 9 09:58:51 2019 -0500

    state: delete .st_ikev2

commit ba376f87af76bc897df984acc3cfc77068bb30bb
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Jan 8 21:51:26 2019 -0500

    ikev2: use st_ike_version == IKEv2
    
    Replacing st_ikev2 as in:
      s/\([^a-z]\)st->st_ikev2\([^_]\)/\1(st->st_ike_version == IKEv2)\2/' -e 's/((st->st_ike_version == IKEv2))/(st->st_ike_version == IKEv2)/

commit c9c256078728cb2a030810274d752ec7c519ac5d
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Jan 8 21:45:31 2019 -0500

    ikev1: use st_ike_version == IKEv1
    
    Replacing !st->ikev2 as in:
      s/!st->st_ikev2\([^_]\)/st->st_ike_version == IKEv1\1/