etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.8 to master 

* 4.8:
  CLOUDSTACK-9256 add unique key for static routes in json
This commit is contained in:
Remi Bergsma 2016-01-26 17:07:37 +01:00
parent 93cf664dd5 48672c7e4a
commit e93fd548d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
View File

@ -20,7 +20,7 @@ from pprint import pprint
def merge(dbag, staticroutes):
for route in staticroutes['routes']:
key = route['ip_address']
key = route['network']
revoke = route['revoke']
if revoke:
try: