etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,421 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

27 Commits

Author SHA1 Message Date
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Edison Su 8b7b838c8a CS-15544: recreate router if router filesystem is crashed 2012-07-11 16:14:28 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-03 17:32:50 -07:00
David Nalley e87558256c Patch from Chip Childers 
https://reviews.apache.org/r/5704/
License header updates for the server folder
 2012-07-02 09:51:21 -04:00
Alena Prokharchyk d9fd7e02a5 Plug nic support 
Conflicts:

	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
 2012-06-15 14:07:46 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk c052d96428 bug 13966: cleanup the vm (stop it on the backend) when work step is Release. Also never retry when finalizeStart failed 
status 13966: resolved fixed
reviewed-by: Alex Huang
 2012-02-23 15:13:47 -08:00
Alena Prokharchyk d4d345a587 Don't retry to re-create the vm when failed to allocate public ip 2012-01-19 14:00:07 -08:00
alena e9dd1ee822 bug 8383: HA: perform ssh check before marking system vms as running. For domR, also reapply all ips/PF/LB/VPN/Dhcp/Userdata. 
status 8383: resolved fixed
 2011-02-04 14:33:14 -08:00
Alex Huang e153ab461c removed unused method 2011-02-04 11:56:21 -08:00
Alex Huang 0105c03a27 initial HA work 2011-02-04 11:51:14 -08:00
Kelven Yang 3b846961ce Bug 8229: Add finalizeExpunge to VirtualMachineGuru interface to allow overriding cleanup operations at expunging stage 
Status 8229: Resolved Fixed
 2011-01-27 10:29:55 -08:00
Alex Huang e8f89004d9 added more robust start code 2011-01-18 16:09:24 -08:00
alena 50540b2bba Stop ConsoleProxy/SecondaryStorage vms: use the same code path as for user vms. 2011-01-14 17:57:15 -08:00
Alex Huang 19edfdfcdb migration code 2011-01-14 15:12:13 -08:00
alena 0b7a15ab99 bug 7348: reapply PortForwardingRules (including 1-1 Nat), LB rules, Vpn as a part of domr Stop/Start 
status 7348: resolved fixed

More fixes:
* Update user_statistics on each domR stop/reboot
* Reset dhcpData/userData as a part of domR stop/reboot
* More logging for domR commands
 2011-01-03 23:00:05 -08:00
Alex Huang da4ed648ac consolidated all of the vm destroy, cleanup and account cleanup. 2010-12-30 05:46:54 -08:00
kishan bb0e6a0ae3 bug 7504: Events refactoring 2010-12-24 12:58:32 +05:30
Alex Huang 356526db83 Changed exception code to give the scope of the problem 2010-12-21 03:54:30 -08:00
Alex Huang 9bae18d915 merge changes 2010-12-08 09:17:44 -08:00
Alex Huang 1fe446002b stop vm is now formalized 2010-11-05 16:10:22 -07:00
Alex Huang e27bb550fe Harmony among gurus 2010-11-03 21:18:31 -07:00
Alex Huang 4db0b7d156 Better integration between it and virtual machine gurus 2010-11-01 15:01:28 -07:00
Alex Huang f58063911e deploy vm completed 2010-10-26 09:35:24 -07:00
Alex Huang 2da8035bd1 more changes for the rewrite 2010-10-19 11:52:02 -07:00
Alex Huang 794ca16a65 Added code to start domR 2010-10-19 11:52:01 -07:00
Alex Huang ce091de3d2 more changes for refactor 2010-10-12 07:17:47 -07:00