etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud
History
Sheng Yang 2df1d7f328 Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" 
This reverts commit f99d599930.

Due to it break vpc function and block regression test.

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java
 		2013-07-21 22:23:48 -07:00
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl CLOUDSTACK-3361. [Projects] Allow a normal user to edit public templates created by him. 2013-07-05 16:21:47 +05:30
agent CLOUDSTACK-3513: add debug message to diagnose copyIso issue on 2013-07-18 16:08:29 -07:00
alert CLOUDSTACK-3365: cluster level parameters cluster.(cpu/memory).allocated.capacity.notificationthreshold is not considering overcommit value 2013-07-20 16:53:45 +05:30
api CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing 2013-07-20 18:01:49 -07:00
async Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
capacity CLOUDSTACK-3551: scaling up VM to service offering with 2gbram 2013-07-18 15:04:20 +05:30
cluster Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
configuration CLOUDSTACK-3453 2013-07-19 16:16:41 -07:00
consoleproxy Changed allocate method to be virtual machine type agnostic 2013-07-17 15:58:46 -07:00
dao Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
dc CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host. <Patch1> 2013-05-30 01:07:01 -07:00
deploy Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
event UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
ha Added more logging to the place where VR investigates whether the user vm is alive, by executing PingCommand 2013-06-19 10:53:56 -07:00
hypervisor CLOUDSTACK-3358: create template from a volume/snapshot should also take input from User/Admin whether xstools / vmware tools installed in the VM 2013-07-19 11:55:32 +05:30
keystore merge master 2013-05-11 15:28:43 +05:30
metadata UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
network Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" 2013-07-21 22:23:48 -07:00
projects UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
resource Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
resourcelimit CLOUDSTACK-3492: [Regression]Update Resource Count for an account is updating the primary storage incorretly. 2013-07-19 16:04:10 +05:30
secstorage merge master 2013-05-11 15:28:43 +05:30
server UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
servlet merge master 2013-05-11 15:28:43 +05:30
storage CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS. 2013-07-19 13:26:19 -07:00
tags UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
template CLOUDSTACK-3358: create template from a volume/snapshot should also take input from User/Admin whether xstools / vmware tools installed in the VM 2013-07-19 11:55:32 +05:30
test SolidFire plug-in and related changes 2013-06-28 16:59:21 -06:00
usage UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
user CLOUDSTACK-3476:deleteDomain api should fail when release dedicated resource to that domain fails 2013-07-17 11:25:39 -07:00
uuididentity When UUID field is null for existing records, set it to id 2013-05-14 15:11:41 -07:00
vm CLOUDSTACK-3451 Parallel deployment - Xenserver - When deploying 30 Vms in parallel, some of the Vm deployment fails when “applying dhcp entry/applying userdata and password entry on router” and retry eventually happens when they succeed. 2013-07-18 15:32:30 -07:00