Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eaf3ad1d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eaf3ad1d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eaf3ad1d Branch: refs/heads/4.4 Commit: eaf3ad1db42b8b43df6242c6c1053c7c6ddc13dd Parents: 7a57d78 54e9a92 Author: Daan Hoogland <[email protected]> Authored: Thu Sep 4 11:05:58 2014 +0200 Committer: Daan Hoogland <[email protected]> Committed: Thu Sep 4 11:05:58 2014 +0200 ---------------------------------------------------------------------- .../VirtualRoutingResourceTest.java | 1 + .../networkservice/BaremetalPxeManagerImpl.java | 1 + .../element/CloudZonesNetworkElement.java | 2 +- .../VirtualNetworkApplianceManagerImpl.java | 2 +- .../debian/config/opt/cloud/bin/vmdata.py | 57 +++----------------- .../debian/config/var/www/html/latest/.htaccess | 25 +++++++-- 6 files changed, 32 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
