Sheng Yang bde1f6d2de Merge branch 'networkasservice' ...

Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql

2011-11-10 16:36:08 -08:00

..

acl

More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project

2011-10-05 13:24:25 -07:00

agent/api

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

2011-11-10 15:26:39 -08:00

alert

api refactoring

2010-11-21 12:00:21 -08:00

api

Merge branch 'networkasservice'

2011-11-10 16:36:08 -08:00

async

bug 6745: Using UUID instead of integers - for Async Jobs

2011-11-03 07:33:58 -07:00

capacity

bug 10893: Adding a new capacity type - Local Primary storage.

2011-10-27 11:22:18 +05:30

cluster

bug 9127: intermediate checkin for agent load balancer

2011-05-24 18:45:00 -07:00

configuration

Intermidiate checkin to Project feature:

2011-09-20 18:35:28 -07:00

consoleproxy

api refactoring

2010-11-21 12:00:21 -08:00

dao

api refactoring

2010-11-21 12:00:21 -08:00

dc

changes to Create Vlan & Public IPs

2011-10-31 09:53:25 -07:00

deploy

Create network using physical network id

2011-10-20 18:25:13 -07:00

domain

More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project

2011-10-05 13:24:25 -07:00

event

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

2011-11-10 15:26:39 -08:00

exception

1) Added resource limits for the Projects - the same as for the account

2011-09-21 17:09:49 -07:00

host

Bug 11522 - New agent manager

2011-10-24 16:49:32 -07:00

hypervisor

1) Removed tags from the network object

2011-11-01 17:42:06 -07:00

network

Merge branch 'networkasservice'

2011-11-10 16:36:08 -08:00

offering

NaaS: Add redundant capability for Gateway service

2011-11-09 17:09:46 -08:00

org

bug 10197:

2011-07-19 15:49:48 -07:00

projects

bug 6745: Using UUID instead of integers - for all commands

2011-11-03 07:34:00 -07:00

resource

Merge complete except for virtualnetworkappliancemanager

2011-11-10 15:18:16 -08:00

serializer

bug 3179: added "count" parameter to the response to all List* api commands

2011-04-01 19:29:08 -07:00

server

bug 10848: ListCapacity - Full rework. This fixes the pagination logic and the capacities are visible till the cluster level.

2011-10-27 11:18:56 +05:30

storage

bug 10330: refactor storage code befor merge clvm code

2011-10-31 20:25:26 -07:00

template

More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project

2011-10-05 13:24:25 -07:00

user

Bug 11313 - Add an account param/detail/map in the XXXAccount API calls

2011-11-07 14:24:36 -08:00

uservm

bug 8962: moving vm from one account to other

2011-06-09 15:02:47 +05:30

vm

Merge complete except for virtualnetworkappliancemanager

2011-11-10 15:18:16 -08:00