apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,835 Commits 308 Branches 324 Tags
Commit Graph

97 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
Edison Su
3ccc790b1d add sample code to config advanced zone 2011-08-19 18:06:11 -07:00
Edison Su
49f283f364 add sample code to config advanced zone 2011-08-19 18:05:37 -07:00
Edison Su
2e48a9188d add new testcase class, make testcase pydev friendly 2011-08-19 16:22:02 -07:00
Edison Su
3466d3f637 add new testcase class, make testcase pydev friendly 2011-08-19 16:21:16 -07:00
Edison Su
c57ca25d2a need to update configuration 2011-08-18 10:51:50 -07:00
Edison Su
97e9a0171a change parameters 2011-08-18 10:51:44 -07:00
Edison Su
c707aeb5da add more test cases 2011-08-18 10:51:38 -07:00
Edison Su
8fc6e18f46 fix typo 2011-08-18 10:51:34 -07:00
Edison Su
1bc7631bf2 finally, test framework works now 2011-08-18 10:51:31 -07:00
Edison Su
48494c5f20 generate json configuration file for any kind of data center setup, and deploy it 2011-08-18 10:49:18 -07:00
Edison Su
1600d70ca3 fix code generator, some api response is empty 2011-08-18 10:49:18 -07:00
Edison Su
1a82fd46b2 need to update configuration 2011-08-17 18:21:54 -07:00
Edison Su
54e4e0011b change parameters 2011-08-17 10:50:30 -07:00
Edison Su
bb8265ded3 add more test cases 2011-08-16 15:07:49 -07:00
Edison Su
92131e9859 fix typo 2011-08-16 10:30:52 -07:00
Edison Su
449a12870b finally, test framework works now 2011-08-16 10:30:52 -07:00
Edison Su
f4a6c314c5 generate json configuration file for any kind of data center setup, and deploy it 2011-08-16 10:30:52 -07:00
Edison Su
25ce6242c7 fix code generator, some api response is empty 2011-08-16 10:30:52 -07:00
Chiradeep Vittal
e72dbbeeee how to generate api spec file 2011-08-15 17:44:56 -07:00
Edison Su
7372f4a375 add more doc 2011-08-11 13:28:33 -07:00
Edison Su
9151bff1b2 fix typo 2011-08-10 18:37:34 -07:00
Edison Su
1cb9773d1a fix typo 2011-08-10 18:36:42 -07:00
Edison Su
499bdff397 fix cloudkit setup, to use new image 2011-07-08 13:49:53 -07:00
Edison Su
7feaca1d60 fix cloudkit setup, to use new image 2011-06-27 16:06:52 -04:00
Edison Su
3cddd72c9b fix template sync issue 2011-06-02 22:38:13 -04:00
Chiradeep Vittal
303e2a7481 Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
Alex Huang
8b06aed43b added mockito for mocking 2011-03-19 11:46:18 -07:00
anthony
8e334107f0 remove timestamp check for vhd-util check 2011-03-07 19:47:29 -08:00
anthony
e01ca05208 copy_vhd_from_secondarystorage implement coalesce 2011-03-07 19:47:29 -08:00
anthony
79dacfacb5 Revert "make vhd-util cross build work" 
This reverts commit c26de0b3e15ab5155b8fe62d729e7e2182404667.
 2011-03-07 19:47:28 -08:00
anthony
95d39161cc vhd-util coalesce to a specified file 2011-03-01 19:58:47 -08:00
anthony
c26de0b3e1 make vhd-util cross build work 2011-03-01 17:48:11 -08:00
anthony
fecd83d2b4 import vhd-tools from xen-4.0.1 2011-02-28 19:41:14 -08:00
Kelven Yang
4a66441b93 Fix Eclipse project settings for separation of JUnit 2011-02-17 09:55:05 -08:00
Alex Huang
c6efb2b09d bug 8529: propagated to master. Added junit test support to ant 2011-02-16 17:40:59 -08:00
edison
e67e7d0e7b remove patches/systemv, and mv tools/systemvm into patches 2010-10-05 20:41:39 -07:00
edison
0e5469340c fix typo, should be "dev eth2" 2010-09-27 17:24:45 -07:00
edison
2d728d4044 set default gateway always on eth2, to fix the bug that system vm is not pingable, if public network and 
private network both are in the same subnet.
 2010-09-27 17:08:31 -07:00
kishan
9135553a45 Bug 6175: clear rules when pub interface is remove 2010-09-17 12:24:37 +05:30
Chiradeep Vittal
e7c280214b file util required by download manager 2010-09-09 18:14:03 -07:00
Alex Huang
7249f168d5 more file changes 2010-09-09 13:27:20 -07:00
Manuel Amador (Rudd-O)
b0acdbcf8b Split out build responsibility into per-project wscript_build files. Installation of generic directories like bindir, and creation of systemvms, remain in toplevel wscript_build. Make some waf code useful and reusable in the form of tools. 2010-08-31 20:40:17 -07:00
Chiradeep Vittal
2164d07b61 Make the vm smaller 2010-08-27 09:38:33 -07:00
Chiradeep Vittal
aa49f9f98b Initial checkin of systemvm builder for debian-based systemvm 2010-08-23 18:40:06 -07:00
Alex Huang
3318f6dcb4 Issue #: 5890 Changes to projects to work in git 
Status 5890: resolved works for me
 2010-08-11 09:41:15 -07:00
Manuel Amador (Rudd-O)
05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00