You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/02/04 09:28:22 UTC
[2/8] git commit: updated refs/heads/master to 7017a82
CLOUDSTACK-9266: Make deleting static routes in private gw work
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4041560
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4041560
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4041560
Branch: refs/heads/master
Commit: a40415604a9a8bbdc7833d850c4f74d66236d334
Parents: 333957f
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Jan 30 06:24:03 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Jan 30 06:25:00 2016 +0100
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/cs_staticroutes.py | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4041560/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
index 987005b..209eefe 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
@@ -21,13 +21,5 @@ from pprint import pprint
def merge(dbag, staticroutes):
for route in staticroutes['routes']:
key = route['network']
- revoke = route['revoke']
- if revoke:
- try:
- del dbag[key]
- except KeyError:
- pass
- else:
- dbag[key] = route
-
+ dbag[key] = route
return dbag