| .. |
|
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
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
alert
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
api
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
async
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
baremetal
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
capacity
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
certificate/dao
|
Add Spring annotation to major components
|
2012-11-07 14:53:39 -08:00 |
|
cluster
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
configuration
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
consoleproxy
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
dao
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
dc
|
Sync javelin with master up to 894cb8f7d9
|
2013-01-31 17:20:19 -08:00 |
|
deploy
|
Planner should set the pool information in the destination for volumes that are not yet ready.
|
2013-01-23 17:31:00 -08:00 |
|
domain
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
event
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
ha
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
host/dao
|
Fixing error with merge
|
2013-01-22 16:44:28 -08:00 |
|
hypervisor
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
keystore
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
maint
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
migration
|
Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption
|
2013-01-17 18:55:14 -08:00 |
|
network
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
offerings
|
All merge conflicts resolved
|
2013-01-18 12:14:57 -08:00 |
|
projects
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
resource
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
resourcelimit
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -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
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
service
|
Put usage server under Spring
|
2013-01-25 23:00:55 -08:00 |
|
servlet
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
storage
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
tags
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
template
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
test
|
Fix issues after another round of merge
|
2013-01-11 16:54:32 -08:00 |
|
upgrade
|
Merge latest master into javelin
|
2013-01-31 11:34:49 -08:00 |
|
usage
|
Merge branch 'api_refactoring' into javelin
|
2013-01-08 12:36:04 -08:00 |
|
user
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
|
uuididentity
|
Improve component lifecycle management with system run-level concept
|
2013-01-30 15:21:02 -08:00 |
|
vm
|
Sync master to javelin one more time
|
2013-02-01 11:37:33 -08:00 |
7b75f0d990