Merge release branch 4.7 to 4.8

* 4.7:
  CLOUDSTACK-9256 add unique key for static routes in json
This commit is contained in:
Remi Bergsma 2016-01-26 17:07:04 +01:00
commit 48672c7e4a

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: