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/01/26 17:08:08 UTC
[1/4] git commit: updated refs/heads/master to e93fd54
Repository: cloudstack
Updated Branches:
refs/heads/master 93cf664dd -> e93fd548d
CLOUDSTACK-9256 add unique key for static routes in json
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62fc6fef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62fc6fef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62fc6fef
Branch: refs/heads/master
Commit: 62fc6fef97efb2c938737262cabb9254fca55ba1
Parents: 7ad0d47
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Jan 25 17:17:55 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Jan 25 17:17:55 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62fc6fef/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 d5ffae1..987005b 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
@@ -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:
[2/4] git commit: updated refs/heads/master to e93fd54
Posted by re...@apache.org.
Merge pull request #1364 from remibergsma/CLOUDSTACK-9256
CLOUDSTACK-9256 add unique key for static routes in jsonStatic routes that are being set do not show up in the static_routes.json file. The reason for this is that the index that is used, is the gateway address, which is not unique. Hence stuff is overwritten and lost.
Ping @borisroman @wilderrodrigues @DaanHoogland
* pr/1364:
CLOUDSTACK-9256 add unique key for static routes in json
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/782d5d73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/782d5d73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/782d5d73
Branch: refs/heads/master
Commit: 782d5d73f5c05e706fa9f4dbf3559e0dd79bae44
Parents: e24d5e5 62fc6fe
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Jan 26 17:06:21 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Jan 26 17:06:21 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] git commit: updated refs/heads/master to e93fd54
Posted by re...@apache.org.
Merge release branch 4.7 to 4.8
* 4.7:
CLOUDSTACK-9256 add unique key for static routes in json
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48672c7e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48672c7e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48672c7e
Branch: refs/heads/master
Commit: 48672c7e4a9591883729541ad1df1ee4336ed090
Parents: 3bf50b6 782d5d7
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Jan 26 17:07:04 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Jan 26 17:07:04 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] git commit: updated refs/heads/master to e93fd54
Posted by re...@apache.org.
Merge release branch 4.8 to master
* 4.8:
CLOUDSTACK-9256 add unique key for static routes in json
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e93fd548
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e93fd548
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e93fd548
Branch: refs/heads/master
Commit: e93fd548d60a96fc6a97a2be07a76f165e9e8fa9
Parents: 93cf664 48672c7
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Jan 26 17:07:37 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Jan 26 17:07:37 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------