apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,043 Commits 304 Branches 324 Tags
Commit Graph

207 Commits

Author SHA1 Message Date
alena
8a7feb8ec1 Merge branch '2.2.y' 
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
 2011-08-22 20:28:30 -07:00
Naredula Janardhana Reddy
4369b0ba96 bug 1067: 
- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules.
 2011-08-19 11:10:16 +05:30
anthony
e4162e5be6 fixed the script 2011-08-16 15:24:34 -07:00
anthony
cd57e03e1d fixed the script 2011-08-16 15:23:53 -07:00
anthony
2cea330540 fixed script 2011-08-16 15:19:32 -07:00
anthony
3802426ae3 Revert " fixed script" 
This reverts commit 90ac340d39ead1f31c11449671a1aec4fd6f27e2.
 2011-08-16 15:18:20 -07:00
anthony
1806ca6364 fixed the script 2011-08-16 15:15:34 -07:00
anthony
20fd2723e9 fixed script 2011-08-16 15:14:54 -07:00
Sheng Yang
9d46de1543 Copy missed getRouterStatus.sh to XenServer FP1 host 2011-08-16 14:21:32 -07:00
Sheng Yang
b73861061a Copy missed getRouterStatus.sh to XenServer FP1 host 2011-08-16 14:21:20 -07:00
anthony
6d29cba58c fixed script 2011-08-16 12:26:04 -07:00
anthony
c2dd960405 VLAN patch for XenServer 5.6 2011-08-15 13:55:06 -07:00
anthony
4b3f57fd28 VLAN patch for XenServer 5.6 2011-08-15 13:54:43 -07:00
anthony
e5e85d05e9 bug 10695: add XCP 1.0 support 
status 10695: resolved fixed

Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
 2011-08-09 19:51:32 -07:00
anthony
33b3e02c17 bug 10695: add XCP 1.0 support 
status 10695: resolved fixed
 2011-08-09 19:49:12 -07:00
anthony
94861ecf4a For some NFS Servers, mount option tcp is required 2011-08-08 17:58:47 -07:00
anthony
ef2802aaed For some NFS Servers, mount option tcp is required 2011-08-08 15:31:18 -07:00
Chiradeep Vittal
8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
Chiradeep Vittal
736b6cf98e properly clean up rules for nonexistent vms 2011-08-04 22:58:42 -07:00
Chiradeep Vittal
0c408d8da5 handle elb vm restart 2011-08-04 22:05:48 -07:00
alena
8d47c53735 Revert "bug 10435: removed vpn feature" 
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2011-08-02 18:12:57 -07:00
Edison Su
0bc6026d6b fix description of addcluster api, and a typo in one script 2011-08-01 14:28:39 -07:00
anthony
7c420a071c use rmdir 2011-08-01 11:55:05 -07:00
anthony
767d4b104a use rmdir 2011-08-01 11:48:56 -07:00
Edison Su
31549b337e bug 10622: use /root/.ssh/id_rsa.cloud instead of ~/.ssh/id_rsa.cloud 
status 10622: resolved fixed
 2011-07-29 17:06:44 -07:00
Edison Su
c3174664de after vm reboot, change the security group if needed 2011-07-29 15:28:16 -07:00
Chiradeep Vittal
29c88787e1 from eip feature: 
1. fix ordering of ingress and egress rules so that vms are protected from other vms on the same host in all cases
2. remove dependency on cloud-guest
 2011-07-28 16:08:51 -07:00
anthony
6620d39b7e fixed cloud-prepare-upgrade.sh 2011-07-28 15:07:26 -07:00
anthony
b63bee2d9a bug 10197: add some scripts which is used in upgrade 2011-07-28 15:07:08 -07:00
anthony
fc94196920 fixed cloud-prepare-upgrade.sh 2011-07-28 15:03:39 -07:00
Edison Su
5724a016c6 fix security group clean up on centos 5 2011-07-26 16:57:49 -07:00
anthony
5b168f30e0 bug 10197: add some scripts which is used in upgrade 2011-07-26 16:22:54 -07:00
anthony
bad0f77659 use the safe way to delete secondary storage directory 2011-07-25 18:16:05 -07:00
anthony
a7af9cdae2 use the safe way to delete secondary storage directory 2011-07-22 19:35:46 -07:00
anthony
afbadbf223 use the safe way to delete secondary storage directory 2011-07-22 19:29:58 -07:00
anthony
e666cf5e77 bug 10743: default local storage is ext in XenServer 6.0, add ext local storage support 2011-07-21 17:31:43 -07:00
anthony
c152d1c33f support XenServer 6.0 beta 2011-07-20 16:47:48 -07:00
anthony
9f2eaca6cb Support XenServer 6.0 beta 2011-07-20 16:47:48 -07:00
anthony
7a47a5afcf introduce nfs.py and NFSSR.py from XenServer 6.0 beta 2011-07-20 16:47:48 -07:00
Sheng Yang
44d4113ae6 bug 10429: backport redundant router 
Part 2

commit 797839360c65cd348d2eb20630521177ab0919de
    bug 9154: redundant virtual router

commit 8ff7f230204d4d3a7a4adee75523a9a84f4276fe
    bug 9154: Replace domain_router.is_master with domain_router.redundant_state in DB

commit 230b99e9e0b152648f1dd2a5eab6f22315b8e7b4
    bug 9154: Add redundant state to DomainRouterResponse

commit ccefb5ff5e83d713798a347c99bce1a0d04b4317
    bug 9154: Add router fault state report

commit 7a3090378f9785caecf741b70554f6ea17c41764
    bug 9154: Send alert if found two virtual routers in master state

commit 66831056e4bf27665871bccd24e6159071564847
    bug 9154: Code clean up

commit bf3f58a85741fa7118bd848a42d8b21baa4478d4
    bug 9154: Add isRedundantRouter to DomainRouterResponse
 2011-07-18 18:30:02 -07:00
Edison Su
a3da10e9b8 bug 10622: use /root/.ssh/id_rsa.cloud instead of ~/.ssh/id_rsa.cloud 
status 10622: resolved fixed
 2011-07-13 17:49:43 -07:00
Chiradeep Vittal
7d95efb7c6 fix ipset problem introduced by 58e92bbe84c2a61ef72913dcb4a88cd761c89604 2011-07-10 12:44:15 -07:00
Edison Su
81475c256b fix user/meta data: if data is empty, return a blank file, not 404 2011-07-08 13:50:27 -07:00
Edison Su
45ea2b2ad6 cleanup ebtables rules if vm is manually deleted 2011-07-08 13:32:41 -07:00
Edison Su
8306bf7ee5 fix ebtable cleanup issue: on ubuntu, it's not got deleted if vm is stopped 2011-07-08 13:31:34 -07:00
Edison Su
04b15b9941 fix ebtable, which should only add a new DNAT rule for dhcp server 2011-07-08 13:02:38 -07:00
Edison Su
56bc4f27a9 fix user/meta data: if data is empty, return a blank file, not 404 2011-07-01 12:58:14 -07:00
alena
74f34a0e0c bug 10435: removed vpn feature 
status 10435: resolved fixed
 2011-06-24 09:18:46 -07:00
David Nalley
6bb0b490ca fixing some typos in error messages 2011-06-20 15:22:33 -04:00
David Nalley
fb0dae2ce5 fixing some typos in error messages 2011-06-20 15:18:30 -04:00