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/network
History
Alena Prokharchyk 214bbf3ebd CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 
Conflicts:

	api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
	server/src/com/cloud/network/element/CiscoNexusVSMElement.java
	server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
	server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/element/OvsElement.java
	server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/storage/StorageManager.java
 		2012-10-17 17:26:19 -07:00
..
addr Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
dao CS-16412: fixed count for following commands: 2012-10-15 18:16:59 -07:00
element CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 2012-10-17 17:26:19 -07:00
firewall CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
guru Fixed regression in GuestNetworkGuru - get networkId from the network object passed to the method call instead of retrieving it from tne NicProfile when it wasn't set yet 2012-08-17 09:43:34 -07:00
lb CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
router CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 2012-10-17 17:26:19 -07:00
rules CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
security Closing open transactions from SecurityGroupWorkDao 2012-09-12 18:48:33 +05:30
vpc CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 2012-10-17 17:26:19 -07:00
vpn CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 2012-10-17 17:26:19 -07:00
ExteralIpAddressAllocator.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalFirewallDeviceManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalFirewallDeviceManagerImpl.java Elimiate mystery guestIp in IpAddressTO 2012-09-12 15:42:48 -07:00
ExternalFirewallDeviceVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerDeviceManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerDeviceManagerImpl.java Elimiate mystery guestIp in IpAddressTO 2012-09-12 15:42:48 -07:00
ExternalLoadBalancerDeviceVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerUsageManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerUsageManagerImpl.java VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call 2012-07-10 15:20:39 -07:00
ExternalNetworkDeviceManager.java Submit Midokura SDN controller stubs 2012-08-13 18:55:11 +05:30
ExternalNetworkDeviceManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
FirewallRulesCidrsVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
IPAddressVO.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
InlineLoadBalancerNicMapVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
IpAddrAllocator.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
LBStickinessPolicyVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
LoadBalancerVMMapVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
LoadBalancerVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkAccountDaoImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkAccountVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkDomainVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkExternalFirewallVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkExternalLoadBalancerVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkManager.java CS-16222: send password reset command only to the element responsible for the userdata service in network 2012-09-04 13:41:10 -07:00
NetworkManagerImpl.java CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 2012-10-17 17:26:19 -07:00
NetworkRuleConfigVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkServiceMapVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkUsageManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkUsageManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkVO.java VPC: more unittests for VpcService 2012-08-07 11:37:36 -07:00
PhysicalNetworkVO.java [ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch. 2012-08-21 16:27:54 -07:00
PortProfileManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
PortProfileVO.java Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
RemoteAccessVpnVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
RouterNetworkVO.java Fixed license headers 2012-07-18 14:52:13 -07:00
Site2SiteCustomerGatewayVO.java S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
Site2SiteVpnConnectionVO.java S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
Site2SiteVpnGatewayVO.java S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
SshKeysDistriMonitor.java VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07:00
StorageNetworkManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
StorageNetworkManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00