You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2014/11/14 20:45:46 UTC

git commit: updated refs/heads/master to fd03091

Repository: cloudstack
Updated Branches:
  refs/heads/master 62a7a02f7 -> fd03091c8


Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"

This reverts commit e1c788ca3c69a8c8c2041c7b106f76fa49332888.

This breaks Windows 7 client.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fd03091c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fd03091c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fd03091c

Branch: refs/heads/master
Commit: fd03091c811992764d5ab27f7a9e3e9be4889616
Parents: 62a7a02
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Nov 14 11:44:53 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Nov 14 11:44:53 2014 -0800

----------------------------------------------------------------------
 systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd03091c/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
index 1cdd69d..7459e25 100644
--- a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
+++ b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
@@ -30,5 +30,4 @@ conn L2TP-PSK
         # ----------------------------------------------------------
         # Change 'ignore' to 'add' to enable this configuration.
         #
-        forceencaps=yes
         auto=add