Alena Prokharchyk d9e1c9c502 CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately ...

Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java

2014-03-14 11:57:58 -07:00

..

alert

CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API

2013-12-04 10:05:46 -08:00

api

More generic parameters that are not unknown

2014-03-13 10:40:14 -07:00

capacity

All Checkstyle problems corrected

2013-12-12 12:26:07 -08:00

configuration

Reformatted all of the code.

2013-11-21 06:15:26 -08:00

event

Reformatted all of the code.

2013-11-21 06:15:26 -08:00

ha

Reformatted all of the code.

2013-11-21 06:15:26 -08:00

keystore

Reformatted all of the code.

2013-11-21 06:15:26 -08:00

metadata

Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command

2014-02-10 12:05:59 -08:00

network

CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately

2014-03-14 11:57:58 -07:00

projects

Revert "CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information"

2014-03-03 12:44:08 -08:00

resource

CLOUDSTACK-4760 : Enabling GPU support for XenServer.

2014-03-11 15:44:51 +05:30

resourcelimit

Reformatted all of the code.

2013-11-21 06:15:26 -08:00

server

Reformatted all of the code.

2013-11-21 06:15:26 -08:00

snapshot

All Checkstyle problems corrected

2013-12-12 12:26:07 -08:00

storage/dao

Reformatted all of the code.

2013-11-21 06:15:26 -08:00

template

Fix checkstyle and license issues

2014-02-14 18:37:47 +01:00

user

After merge, fix isRootAdmin() calls to use accountId instead of type

2014-03-13 13:28:40 -07:00

vm

Merge branch 'master' into rbac.

2014-03-13 11:05:03 -07:00

vpc

CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately

2014-03-14 11:57:58 -07:00