Bug 771013 – [review] merge master and nm-1-2 branch of nm-vpnc [th/master-to-1-2-3-bgo771013]

After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.

Bug 771013 - [review] merge master and nm-1-2 branch of nm-vpnc [th/master-to-1-2-3-bgo771013]


Summary:	[review] merge master and nm-1-2 branch of nm-vpnc [th/master-to-1-2-3-bgo771...


Status:	RESOLVED FIXED

Product:	NetworkManager
Classification:	Platform
Component:	VPN: vpnc
Version:	git master
Hardware:	Other Linux

Importance:	Normal normal
Target Milestone:	---
Assigned To:	NetworkManager maintainer(s)
QA Contact:	NetworkManager maintainer(s)

URL:
Whiteboard:

Depends on:
Blocks:

Reported:	2016-09-07 15:37 UTC by Thomas Haller
Modified:	2016-09-08 11:15 UTC

See Also:
GNOME target:	---
GNOME version:	---

Description Thomas Haller 2016-09-07 15:37:58 UTC

Please review

Comment 1 Thomas Haller 2016-09-07 15:39:17 UTC

branch th/master-to-1-2-3-bgo771013

Comment 2 Thomas Haller 2016-09-07 16:50:40 UTC

same branch now for pptp:


https://git.gnome.org/browse/network-manager-vpnc/commit/?h=th/master-to-1-2-3-bgo771013

https://git.gnome.org/browse/network-manager-pptp/commit/?h=th/master-to-1-2-3-bgo771013

Comment 3 Beniamino Galvani 2016-09-08 08:13:38 UTC

Both LGTM.

Comment 4 Thomas Haller 2016-09-08 11:15:40 UTC

merged upstream:

https://git.gnome.org/browse/network-manager-vpnc/commit/?id=15e5b23af9fc47bb7ab76eca71fdc2632f1493cd

https://git.gnome.org/browse/network-manager-pptp/commit/?id=4b65754c4decf452b42ff074148a34f9aba1e6ed


I also delete the nm-1-2 branch.


Now the plugins nm-openvpn, nm-libreswan, nm-pptp, nm-vpnc, and nm-openconnect are all at pretty much the same state (except that the nm-1-2 branch still exists for nm-openconnect).