etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Kelven Yang 2012-02-28 17:06:23 -08:00
parent 52ebf15e7c
commit 5aade501dc
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/test/com/cloud/network/MockNetworkManagerImpl.java
View File

@ -291,10 +291,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
}
@Override
return false;
}
@Override
public boolean destroyNetwork(long networkId, ReservationContext context) {
// TODO Auto-generated method stub
@ -411,13 +407,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
return null;
}
@Override
public Network updateGuestNetwork(long networkId, String name,
String displayText, Account callerAccount, User callerUser,
String domainSuffix, Long networkOfferingId, Boolean changeCidr) {
// TODO Auto-generated method stub
return null;
}
public Map<Service, Set<Provider>> getNetworkOfferingServiceProvidersMap(long networkOfferingId) {
return null;
}