Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-9254: Make longer names display pretty CLOUDSTACK-9245 - Deletes ACL items when destroying the VPC or deleting the ACL itself CLOUDSTACK-9245 - Formatting NetworkACLServiceImpl class CLOUDSTACK-9245 - Formatting VpcManagerImpl class CLOUDSTACK-9245 - Formatting NetworkACLManagerImpl class More VR performance!
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c60ad21 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c60ad21 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c60ad21 Branch: refs/heads/4.8 Commit: 8c60ad214f484de57bc50f85c8d6b51581d2752c Parents: 62f218b 1e4bc9a Author: Remi Bergsma <git...@remi.nl> Authored: Tue Jan 26 08:39:28 2016 +0100 Committer: Remi Bergsma <git...@remi.nl> Committed: Tue Jan 26 08:39:28 2016 +0100 ---------------------------------------------------------------------- .../cloud/network/vpc/NetworkACLService.java | 5 +- .../network/vpc/NetworkACLManagerImpl.java | 135 +++---- .../network/vpc/NetworkACLServiceImpl.java | 251 ++++++------ .../com/cloud/network/vpc/VpcManagerImpl.java | 397 ++++++++++--------- .../com/cloud/vpc/NetworkACLManagerTest.java | 72 ++-- .../debian/config/opt/cloud/bin/configure.py | 51 ++- ui/css/cloudstack3.css | 10 +- ui/scripts/ui/core.js | 2 +- 8 files changed, 474 insertions(+), 449 deletions(-) ----------------------------------------------------------------------