..
account
Patch from Chip Childers
2012-07-02 09:51:21 -04:00
acl
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
agent
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
alert
removed componentlocator and inject
2013-01-10 11:05:20 -08:00
api
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
async
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
baremetal
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
capacity
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
certificate /dao
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
cluster
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
configuration
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
consoleproxy
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
dao
all built with the latest
2013-01-09 05:02:39 -08:00
dc
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
deploy
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
domain
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
event
Fix issues with @DB support in Spring environment
2013-01-15 12:35:03 -08:00
ha
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
host /dao
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
hypervisor
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
keystore
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
maint
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
migration
Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption
2013-01-17 18:55:14 -08:00
network
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
offerings
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
projects
Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment
2013-01-14 13:57:30 -08:00
resource
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
resourcelimit
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
secstorage
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
server
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
service
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
servlet
Fix issues with @DB support in Spring environment
2013-01-15 12:35:03 -08:00
storage
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00
tags
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
template
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
test
Fix issues after another round of merge
2013-01-11 16:54:32 -08:00
upgrade
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
usage
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
user
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
uuididentity
merge compiles
2013-01-09 04:41:27 -08:00
vm
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
2013-01-22 12:56:39 -08:00