[cloudstack] 01/01: Merge pull request #1883 from Accelerite/uniqueMac

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rajani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 339fe4c7bd632c518beb2e67af6fd3f44cc65c6d
Merge: 5c316a9 7eea445
Author: Rajani Karuturi <ka...@users.noreply.github.com>
AuthorDate: Wed May 17 10:36:19 2017 +0530

    Merge pull request #1883 from Accelerite/uniqueMac
    
    CLOUDSTACK-9723: Enable unique mac address across the zones

 api/src/com/cloud/network/NetworkModel.java             |  4 ++++
 engine/api/src/com/cloud/vm/VirtualMachineGuru.java     |  1 -
 .../src/com/cloud/network/addr/PublicIp.java            |  7 +++++--
 engine/schema/src/com/cloud/network/dao/NetworkDao.java |  3 ++-
 .../src/com/cloud/network/dao/NetworkDaoImpl.java       | 10 +++++++---
 .../cloud/configuration/ConfigurationManagerImpl.java   | 17 ++++++++++++++++-
 server/src/com/cloud/network/Ipv6AddressManager.java    |  1 +
 .../src/com/cloud/network/Ipv6AddressManagerImpl.java   |  2 +-
 server/src/com/cloud/network/NetworkModelImpl.java      | 17 +++++++++++++++--
 .../src/com/cloud/network/guru/PodBasedNetworkGuru.java |  4 +++-
 .../src/com/cloud/network/guru/PrivateNetworkGuru.java  |  2 +-
 .../src/com/cloud/network/guru/StorageNetworkGuru.java  |  3 ++-
 .../com/cloud/network/router/NicProfileHelperImpl.java  |  4 ++--
 server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java   |  2 +-
 utils/src/main/java/com/cloud/utils/net/NetUtils.java   | 16 +++++++++++++---
 .../src/test/java/com/cloud/utils/net/NetUtilsTest.java | 13 +++++++++++++
 16 files changed, 86 insertions(+), 20 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.