Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc ...

Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java

2012-08-08 11:50:39 -07:00

..

acl

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

agent/api

S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime

2012-08-06 15:19:26 -07:00

alert

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

api

VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr

2012-08-07 11:21:53 -07:00

async

VPC: intermidiate checkin to Static Routes

2012-06-25 21:00:57 -07:00

capacity

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

cluster

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

configuration

VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:

2012-08-01 18:57:33 -07:00

consoleproxy

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

dao

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

dc

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

deploy

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

domain

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

event

CS-15670: Allow normal users to configure S2S VPN

2012-07-27 16:27:36 -07:00

exception

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

host

Phase 1 of Nicira integration

2012-07-11 17:16:06 -07:00

hypervisor

Merge branch 'master' into vpc

2012-08-01 19:04:28 -07:00

network

Merge branch 'master' into vpc

2012-08-08 11:50:39 -07:00

offering

VPC: added one more default network offering for VPC - the one not having LB service

2012-07-17 17:46:17 -07:00

org

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

projects

ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute

2012-08-01 18:54:08 -07:00

resource

CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster

2012-06-22 13:31:56 -07:00

serializer

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

server

ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute

2012-08-01 18:54:08 -07:00

storage

Merge branch 'master' into vpc

2012-08-03 14:30:54 -07:00

template

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

user

Initialize user context from AccountManager

2012-08-08 11:17:01 -07:00

uservm

committing Chip Childers patches fixing licensing headers

2012-06-12 12:32:58 -04:00

vm

VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones

2012-07-23 16:38:14 -07:00