Merge release branch 4.7 to master * 4.7: CLOUDSTACK-9222 Prevent cloud.log.1 filling up the disk Add integration test for restartVPC with cleanup, and Private Gateway enabled. Nullpointer Exception in NicProfileHelperImpl
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24818af2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24818af2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24818af2 Branch: refs/heads/master Commit: 24818af23ac2e6244ac946a668ea8aa00d0d394d Parents: 75b68c6 4dabd13 Author: Remi Bergsma <[email protected]> Authored: Sat Jan 16 20:25:29 2016 +0100 Committer: Remi Bergsma <[email protected]> Committed: Sat Jan 16 20:25:29 2016 +0100 ---------------------------------------------------------------------- .../network/router/NicProfileHelperImpl.java | 7 +++- .../patches/debian/config/etc/logrotate.d/cloud | 1 - test/integration/smoke/test_privategw_acl.py | 34 ++++++++++++++++++-- 3 files changed, 38 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
