cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [08/48] git commit: updated refs/heads/4.9-bountycastle-daan to 98bf0ca
Date Tue, 24 May 2016 09:49:13 GMT
Resolve conflict as forceencap is already in master


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

Branch: refs/heads/4.9-bountycastle-daan
Commit: ebb7cb690dd04263568cae0a93e4ff28e5ba157a
Parents: 30741a3
Author: Remi Bergsma <github@remi.nl>
Authored: Sat Apr 30 21:09:33 2016 +0200
Committer: Remi Bergsma <github@remi.nl>
Committed: Sat Apr 30 21:09:33 2016 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebb7cb69/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index 27e26a7..1e4469c 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -536,8 +536,6 @@ class CsSite2SiteVpn(CsDataBag):
         file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd']))
         file.addeq(" keyingtries=2")
         file.addeq(" auto=start")
-        if not obj.has_key('encap'):
-            obj['encap']="false"
         file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap']))
         if obj['dpd']:
             file.addeq("  dpddelay=30")


Mime
View raw message