Merge release branch 4.7 to 4.8 * 4.7: Display hostname the VPC router runs on CLOUDSTACK-9266: Make deleting static routes in private gw work CLOUDSTACK-9264: Make /32 static routes for 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/be89f647 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be89f647 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be89f647 Branch: refs/heads/master Commit: be89f64731e57ef75fa441bbadbbde5973b4a17f Parents: 69d1a5e a243339 Author: Remi Bergsma <[email protected]> Authored: Thu Feb 4 09:26:53 2016 +0100 Committer: Remi Bergsma <[email protected]> Committed: Thu Feb 4 09:26:53 2016 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/configure.py | 4 ++-- .../debian/config/opt/cloud/bin/cs_staticroutes.py | 10 +--------- ui/scripts/network.js | 3 +++ 3 files changed, 6 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
