You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/10 22:49:47 UTC

[07/19] git commit: updated refs/heads/feature/vpc-ipv6 to c1b0900

Merge branch 'merge/feature-vpc-ipv6' into feature/vpc-ipv6

This closes #3


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b919644
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b919644
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b919644

Branch: refs/heads/feature/vpc-ipv6
Commit: 3b9196446526a2b24eddf8703a3dca2dfe1c901b
Parents: 13cef9a eb6c990
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Wed Jun 10 09:07:30 2015 +0200
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed Jun 10 09:07:30 2015 +0200

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/ApiConstants.java |   2 +
 .../api/command/admin/zone/CreateZoneCmd.java   |  14 +++
 .../api/command/admin/zone/UpdateZoneCmd.java   |  17 ++-
 .../cloudstack/api/response/ZoneResponse.java   |  17 ++-
 .../configuration/ConfigurationManager.java     |  16 +--
 .../src/com/cloud/dc/dao/DataCenterDao.java     |   4 +
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |  25 +++++
 .../management/ManagementServerMock.java        |   2 +-
 .../configuration/ConfigurationManagerImpl.java | 106 +++++++++++++++----
 .../configuration/ConfigurationManagerTest.java |  79 ++++++++++++++
 .../cloud/vpc/MockConfigurationManagerImpl.java |   6 +-
 tools/marvin/marvin/deployDataCenter.py         |   4 +
 utils/src/com/cloud/utils/net/NetUtils.java     |  30 ++++++
 .../test/com/cloud/utils/net/NetUtilsTest.java  |  19 ++++
 14 files changed, 304 insertions(+), 37 deletions(-)
----------------------------------------------------------------------