Kelven Yang
2c5859dbd4
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
2013-01-18 19:15:32 -08:00
Alex Huang
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
Kelven Yang
b274c570f9
Cleanup places that use explicit wiring of the components
2013-01-08 17:45:33 -08:00
Kelven Yang
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
Kelven Yang
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
Edison Su
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
Alena Prokharchyk
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
kishan
468f2720eb
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:13:18 +05:30
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
David Nalley
59436be4ee
fixing line endings in server
2012-04-07 20:13:10 -04:00
frank
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
frank
0f5384d086
Bug 11522 - New agent manager
...
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
Alex Huang
99bc15f64a
changed getName to getHostname
2011-04-29 08:34:10 -07:00
Kelven Yang
e69774e13a
Add console proxy management state, support certificate upload, all done except UI
2011-04-21 18:46:37 -07: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
anthony
be174f7f36
correct checking answer
2011-01-07 13:54:58 -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
alena
d077b127aa
bug 7498: fixed search by keyword in listUserVm/listSystemVms/listRouters commands
...
status 7498: resolved fixed
2010-12-13 15:22:11 -08:00
Alex Huang
9bae18d915
merge changes
2010-12-08 09:17:44 -08:00
Alex Huang
1e44925564
api refactoring
2010-11-21 12:00:21 -08:00
Alex Huang
e27bb550fe
Harmony among gurus
2010-11-03 21:18:31 -07:00
root
42f1ff92a9
resolved merge conflicts after git pull --rebase
2010-10-26 14:27:26 -07:00
abhishek
f64abad8f5
completed the listener logic. Based on the startup command, we will try and update a cust cert to a new running cpvm, and fail if such a cert doesn't exist in the cert table in our db.
2010-10-26 14:27:26 -07:00
Kris McQueen
8e086d7a21
resolving merge conflicts between 2.1.refactor and master
2010-10-12 16:28:16 -07:00
Kris McQueen
2740ba6c40
final merge of master->2.1.refactor preparing for merge back into master
2010-10-12 14:46:24 -07:00
Kris McQueen
848ce60097
Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.
2010-09-28 15:47:14 -07:00
abhishek
72243c8382
bug 5191: incremental checkin
2010-09-27 11:10:55 -07:00
Kris McQueen
d7b6ccd056
Comment out code in executors during the transition to the new API framework. The code is being left around for reference during testing/debugging of the new framework and will be removed in the future.
2010-09-17 11:13:29 -07:00
Kris McQueen
df10af0688
cleaning up imports, fixing up some compilation problems related to API refactoring
2010-09-13 15:25:46 -07:00
Alex Huang
417a3c8c18
bug 5764: More changes
2010-08-19 11:27:30 -07:00
alena
3d85fdf687
API refactor
2010-08-18 11:24:29 -07:00
Manuel Amador (Rudd-O)
05c020e1f6
Source code committed
2010-08-11 09:13:29 -07:00
