cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 97eb0f7
Date Wed, 05 Aug 2015 08:45:58 GMT
CLOUDSTACK-8707: Removed convert sec to h on esp_lifetime

This closes #655


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

Branch: refs/heads/master
Commit: 97eb0f752886435295dd2be19667e7ec59a2cf7f
Parents: c132013
Author: Jayapal <jayapal@apache.org>
Authored: Tue Aug 4 14:34:00 2015 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Wed Aug 5 14:14:55 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97eb0f75/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 5ed2789..2f3235e 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -459,7 +459,7 @@ class CsSite2SiteVpn(CsDataBag):
         file.addeq(" keyexchange=ike")
         file.addeq(" ike=%s" % obj['ike_policy'])
         file.addeq(" ikelifetime=%s" % self.convert_sec_to_h(obj['ike_lifetime']))
-        file.addeq(" esp=%s" % self.convert_sec_to_h(obj['esp_policy']))
+        file.addeq(" esp=%s" % obj['esp_policy'])
         file.addeq(" salifetime=%s" % self.convert_sec_to_h(obj['esp_lifetime']))
         file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd']))
         file.addeq(" keyingtries=2")


Mime
View raw message