cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [5/5] git commit: updated refs/heads/marvin to 1577c0a
Date Tue, 14 Jan 2014 09:22:07 GMT
Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/marvin
Commit: 1577c0a0dcb69310d64ae9203219891051dc31a0
Parents: 3be221c c108d7f
Author: Sebastien Goasguen <runseb@gmail.com>
Authored: Tue Jan 14 10:21:11 2014 +0100
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Tue Jan 14 10:21:11 2014 +0100

----------------------------------------------------------------------
 api/src/com/cloud/network/NetworkService.java   |    2 +-
 .../command/user/network/DeleteNetworkCmd.java  |   10 +-
 awsapi/pom.xml                                  |   43 -
 client/pom.xml                                  |   30 -
 .../service/NetworkOrchestrationService.java    |    2 +-
 .../orchestration/NetworkOrchestrator.java      |    4 +-
 .../vmware/resource/VmwareContextFactory.java   |    2 +-
 .../vmware/resource/VmwareResource.java         |   12 +-
 .../VmwareSecondaryStorageResourceHandler.java  |   19 +-
 .../management/NetworkProviderTest.java         |    2 +-
 plugins/user-authenticators/ldap/pom.xml        |   33 -
 pom.xml                                         |   27 +
 server/src/com/cloud/api/ApiServer.java         |    6 +-
 .../com/cloud/network/NetworkServiceImpl.java   |    8 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |    2 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    2 +-
 .../src/com/cloud/user/DomainManagerImpl.java   |    3 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    4 +-
 .../component/test_advancedsg_networks.py       | 1973 +++++++++++++++---
 .../component/test_vpc_vm_life_cycle.py         |  104 +-
 tools/marvin/marvin/config/config.cfg           |   20 +-
 .../hypervisor/vmware/util/VmwareContext.java   |   15 +-
 22 files changed, 1832 insertions(+), 491 deletions(-)
----------------------------------------------------------------------



Mime
View raw message