Commit Graph

7158 Commits

Author SHA1 Message Date
Min Chen e1c17bd853 CLOUDSTACK-3513: add debug message to diagnose copyIso issue on
automation setup where DownloadCommand is never sent.
2013-07-18 16:08:29 -07:00
Prachi Damle 463a3aba71 CLOUDSTACK-3451 Parallel deployment - Xenserver - When deploying 30 Vms in parallel, some of the Vm deployment fails when “applying dhcp entry/applying userdata and password entry on router” and retry eventually happens when they succeed.
Changes:
- Passing the avoid set generated by the first pass of deployment to the second try.
- The second try is done, when the first pass that uses a reserved plan fails to deploy on the reserved host, to search over the entire zone again
2013-07-18 15:32:30 -07:00
Min Chen 598a647105 ListIsos only shows cross-zone ISO in one zone. 2013-07-18 10:56:45 -07:00
Devdeep Singh 876a7b3361 Add VHDX image support, which is missing from DiskFormat class, revised ImageFormat interface, StorageManager implementation, and the application component spec. 2013-07-18 18:58:05 +05:30
Prasanna Santhanam 0c5b698ac8 CLOUDSTACK-3633: AffinityGroupResponse does not include uuid
The uuid->id of the affinity group created is not included as part of
the response. Included the uuid.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit fbf38a35d2)

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-18 18:31:23 +05:30
Harikrishna Patnala b4662af0a9 CLOUDSTACK-3551: scaling up VM to service offering with 2gbram
Fixed the type overflow of Ram value.
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-18 15:04:20 +05:30
ahuang 11971b5a58 Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
Min Chen cb2a84241b CLOUDSTACK-3513: [Automation] Failed to copy iso and template between
zones.
2013-07-17 17:31:50 -07:00
ahuang 1e3e131e14 Save the zone and pod 2013-07-17 17:14:30 -07:00
ahuang cb5ab37916 Fixed the account id 2013-07-17 16:21:14 -07:00
ahuang 541f9d7f9c Changed allocate method to be virtual machine type agnostic 2013-07-17 15:58:46 -07:00
Saksham Srivastava e8e207863c CLOUDSTACK-3476:deleteDomain api should fail when release dedicated resource to that domain fails 2013-07-17 11:25:39 -07:00
Bharat Kumar f76bf5b053 Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 15:22:33 +05:30
Sanjay Tripathi 21b1c9449a CLOUDSTACK-3376: NPE: resource count calculation from the account manager on account cleanup
This issue is happing because of the steps the code follow to cleanup the account.
The cleanupAccount was deleting the entries from the resource_limit and
resource_count table and performing further cleaning afterwards. Ideally, deletion
of entries from resourceLimit and resourceCount should be the last step in
cleanupAccount process.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-17 12:39:16 +05:30
Bharat Kumar d73bb22802 Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 12:35:06 +05:30
Abhinandan Prateek 954e197813 Cloudstack-2997: maxconn missing param 2013-07-17 10:06:11 +05:30
Bharat Kumar dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Bharat Kumar 6b549074fa Cloudstack-3313 Cannot deploy vm in ipv6 network
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Edison Su bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
Sheng Yang 86bbe211f2 CLOUDSTACK-494: Loose the limition of same ip used by site-to-site vpn
Different account can have same remote side IP now. Of course the remote side need
to identify them and configured properly to handle it.
2013-07-16 17:26:51 -07:00
Vijayendra Bhamidipati fff763ef81 CLOUDSTACK-3514: [Automation] Vmware - Failed to download default template for first zone
Description:

    Fixing reference to null object.
2013-07-16 16:14:51 -07:00
Sheng Yang 43ebb1c822 CLOUDSTACK-1670: Fix the order of user vm's multiple nics
They should follow the order of networkIds parameter of deployVMCmd(). And eth0
would be always on default network.
2013-07-16 16:07:36 -07:00
Prachi Damle ee664a1cac CLOUDSTACK-2159 Anti-Affinity - When "HostAntiAffinityProcessor" plugin is not included in the deployment , deployVirtualMachine() command does not error out when passing the affiitygroupnames parameter.
Changes:
- Added a check during vm deployment to see if a processor for the affinity group type is available
2013-07-16 15:48:07 -07:00
ahuang 11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Prachi Damle fa9ca72f36 CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 10:53:06 -07:00
Prachi Damle 661088927d CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes to check if the destination found does not conflict with any vm reservation
2013-07-16 10:53:02 -07:00
Likitha Shetty d7122bc144 CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref. 2013-07-16 14:53:58 +05:30
Likitha Shetty 33d6f7a8c4 Revert "CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref."
This reverts commit 22ddc3fa06.
2013-07-16 14:10:28 +05:30
Likitha Shetty 22ddc3fa06 CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref. 2013-07-16 13:45:11 +05:30
Devdeep Singh 04a8682313 CLOUDSTACK-3545: NPE in listStoragePoolsForMigration api. The volume table no longer holds
the pod id, the column is null now. Made a change to get the pod id from the storage pool
on which the volume resides.
2013-07-16 12:01:28 +05:30
Sheng Yang ab42c1d6da CLOUDSTACK-3539: Fix wrong management ip when server start up
The value "localhost" for mgmt server should be over-written anyway.
2013-07-15 18:27:15 -07:00
Min Chen 52434dabcc CLOUDSTACK-2595: [Automation] Failed download default template for
second zone. Actually it is a listTemplate issue.
2013-07-15 17:38:09 -07:00
ahuang 17984a3f8c Removed the plug and unplug method from VMGuru. Why should VMGuru understand how to plug and unplug nics? Part of componentizing the vmsync work 2013-07-15 11:00:58 -07:00
Alena Prokharchyk e52cde5878 CLOUDSTACK-3346: Fixed setting up resourceTags for network ACL - added missing @Inject when load NetworkACLItemDao 2013-07-15 10:24:37 -07:00
Murali Reddy f53db88bae CLOUDSTACK-2960: [portableIPrange] CS should check the portable ip range, vlan with
existing public ip ranges and vlans

adds a validation check to ensure there is no VLAN in the zones with
same id
2013-07-15 16:16:47 +05:30
Murali Reddy 0c32466a75 CLOUDSTACK-3463: [Portable IP] [EIP/ELB Zone] EIP semantics are not
intact with portable IP

fix ensures that, on release of portable IP associated with 'EIP
enabled' basic zone vm, a new system public IP is allocated and
associated with the VM
2013-07-15 09:52:45 +05:30
Murali Reddy 4466492484 CLOUDSTACK-3444: Unable to transfer portalbe IP between ISOLATED network and VPC
Tiered Network

When portable IP is transferred across the zones, we emulate portable IP
as provisioned in new zone's physical network carrying public traffic
and logical public network. network Id, and physical network id both
were bieng set to same physical network id resulting in IP association
to fail. This fix ensures both network and physcial network are set
appropriatley.
2013-07-15 08:48:50 +05:30
Edison Su 8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Edison Su 0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Vijayendra Bhamidipati b36607742e CLOUDSTACK-3509: Put in missing code to kick off non root volume resize operations in vmware deployments
Description:

    Include vmware in list of hypervisors supporting volume resize.
2013-07-12 15:20:21 -07:00
Vijayendra Bhamidipati d9ce49b1f1 CLOUDSTACK-3264: [ZWPS]NPE while finding storage pools for migration
Description:

    Filter primary storage pools based on zonewide/clusterwide configuration
    when considering pools to list for storage migration of volumes.
2013-07-12 15:19:36 -07:00
Mike Tutkowski 505ab2eebe Changes related to Review Board comments
Changes related to Review Board comments

Changes related to Review Board comments
2013-07-12 14:28:00 -06:00
Hugo Trippaers 2691970f28 CLOUDSTACK-728 Get the framework in place the support the removal of the portgroup that is created for a nic connected to an lswitch.
Add a command to tell a hypervisor guru to take some action when
expunging a nic
2013-07-12 12:18:34 +02:00
Harikrishna Patnala 5dd1a1dd8e CLOUDSTACK-2987: Fixing dynamicallyScalable flag in register and update template API Previuos commit: 7b6b8d7a07 This fix is due to some changes made by the merges after this commit.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-12 15:19:25 +05:30
Murali Reddy b3fd25d45e CLOUDSTACK-3485: NPE while getting instance ID from Asyn Job when
publishing async job events on eventbus

handing case where instance id is null in the asyn job, while publishing
asyn job events on to event bus
2013-07-12 13:48:00 +05:30
Saksham Srivastava bdc7e4ce33 CLOUDSTACK-3094: Adding a shared network to already deployed VM is failing.
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-07-12 14:30:10 +08:00
Alena Prokharchyk dd91974920 CLOUDSTACK-2843: added CopyCommand to the list of the commands controlled by execute.in.sequence.hypervisor.commands global config. This command was introduced by the Storage refactoring, and used for volume creation on the primary storage 2013-07-11 17:44:12 -07:00
ahuang 96d29c7f3d Added the git commit and branch to war file 2013-07-11 17:33:31 -07:00
Alena Prokharchyk 3984287434 CLOUDSTACK-3458: network GC thread - acquire global lock to prevent multiple MS from running the GC thread on the network at the same time 2013-07-11 09:37:57 -07:00
Wei Zhou 1a0302465b CLOUDSTACK-3368: clear download URLs when create SSVM and validate download URLs 2013-07-11 16:07:48 +02:00
Wei Zhou d2a751fb1e CLOUDSTACK-3362: use POST instead of GET and encode/decode cert/key in uploadCustomCertificate 2013-07-11 16:06:21 +02:00
Daan Hoogland b903262df5 CLOUDSTACK-3357: dnsmasq on vpc-routervm 2013-07-11 14:33:20 +01:00
Murali Reddy 7f2c659630 CLOUDSTACK-1673: AWS Regions - Events - User disable / Domain Delete event does not
include the UUID of the user/domain that was disabled.

- added enity type and enity UUID details to UserContext
- publish the entity type and UUID details for the action events
  generated  for accout/user/domain
2013-07-11 18:01:43 +05:30
Koushik Das 5c3013a694 CLOUDSTACK-3248: XenServer Host got removed successfully inspite of running VMs on the host
In UI there is a restriction to first put a host in maintenance and only then deletion is allowed. But there is no such restriction in the deleteHost API.
Added a validation in deleteHost API to prevent deletion if the host is not in maintenance. In case of a forced deletion the restriction doesn't apply.
2013-07-11 17:25:42 +05:30
Sanjay Tripathi 429e6bd4bb CLOUDSTACK-1768: Ability to delete Events and Alerts: Delete by a time period is required.
User should be able to delete/archive alerts and events by selecting a time period or by
choosing the alerts and events older than a date. Added the ability to choose a time period
too.
2013-07-11 14:12:17 +05:30
Likitha Shetty 47de56d665 CLOUDSTACK-3447. CLOUDSTACK-3448.
Correct the access check on networks in APIs addNicToVM and removeNicFromVM
2013-07-11 13:50:11 +05:30
Wei Zhou 33376f1459 CLOUDSTACK-3244: Inject KeystoreManager in ManagementServerImpl 2013-07-11 09:58:25 +02:00
Koushik Das e3e8bfce16 CLOUDSTACK-3441: [Load Test] High delays between VM being allocated to Pod and network implementation causing delays in VM deployment
This is a regresion caused due to fix for CLOUDSTACK-70. In order to fix network restart scenario, delays got introduced in the user VM deployment scenario.
Fixed it by separating out the network restart and new VM deployment scenario such that the latter is not affected due to the fix for CLOUDSTACK-70.
2013-07-11 12:03:09 +05:30
Sanjay Tripathi 2e8d16b365 CLOUDSTACK-1047: tracking in logs using job id. 2013-07-11 10:41:39 +05:30
Likitha Shetty 873e4e0e58 CLOUDSTACK-3423. Publish 'VM.UPGRADE' usage event every time the service offering of a VM is upgraded. 2013-07-11 10:06:10 +05:30
Alena Prokharchyk 56da71e5b6 CLOUDSTACK-3455: delete Shared networks of the domain when do domain deletion 2013-07-10 15:36:24 -07:00
Vijayendra Bhamidipati 7ea8c5fd9a CLOUDSTACK-1510: NPE when primary storage is added with wrong path
Description:

	a) Fixing NPE when wrong path is provided for primary datastore.
	b) No error dialog shows up in GUI when wrong path is provided,
	   after NPE fix - propagating exception upward.
	c) If the KVM agent is down, an invalid datastore gets logged in
	   storage_pool table and doesn't get removed, so it shows up
	   in the GUI in the list of datastores - fixing this as well.
2013-07-10 14:55:57 -07:00
Rajesh Battala 7089e1ce44 CLOUDSTACK-3301 NPE wile deployVM in kvm Only solidfire type PS is setting/using the capacityIops, This check will fix to return the storage has enough Iops when capacityIops is set to NULL for any PS Storage provider 2013-07-10 14:52:47 -07:00
Jessica Wang ec42d7236c CLOUDSTACK-2988: API - Template Response - add isdynamicallyscalable property. 2013-07-10 13:51:54 -07:00
Murali Reddy 92884d1aa0 CLOUDSTACK-3442: [PortableIP] [VPC] Unable to associate Portable IP to VPC
removing invalid check
2013-07-10 19:30:56 +05:30
Devdeep Singh 033d05fa20 CLOUDSTACK-3443: Timeoffset on windows guest not persisted between VM stop and start on XenServer.
The problem was because in cloudstack when a vm is stopped it gets destroyed on the host. For a
windows vm the timeoffset (which can be set by changing the timezone from within the vm) is stored
in the platform:timeoffset attribute of vm record. The information is lost when the vm is destroted.
Made change to read and persist the platform:timeoffset vm attribute when an instance is stopped.
The value is persisted in the user_vm_details table. When the vm is started again the attribute is
set for the vm instance that gets created.
2013-07-10 17:36:06 +05:30
Murali Reddy 3c1b3c71fe CLOUDSTACK-3440: action events are not published due to conflict of
Eventutils and ActionEventUtils files

removing the 'EventUtils' file which got merged back during the Spring
changes to master at 4.1. 'EventUtils' file was replaced by
'ActionEventUtils', and the original file was removed for events
frameworks. This file conflict was resulting in action events not to be
published on to event bus
2013-07-10 16:44:08 +05:30
Wei Zhou d65f47c76a CLOUDSTACK-3438: update CPVM SSL certificate for both Premium and non-Premium cases 2013-07-10 12:20:57 +02:00
Koushik Das aed49572c7 CLOUDSTACK-2918: In a scaled up environment, hosts fail to come up after Management server restart in clustered set up
Summary of changes in the fix
- Optimized host scan logic, now instead of iterating over each cluster host scan is done for a batch of clusters
- Made host scan task interval configurable
2013-07-10 12:13:24 +05:30
Mike Tutkowski 06f73092fb Changes related to Review Board comments 2013-07-09 22:50:14 -06:00
Marcus Sorensen e731722263 CLOUDSTACK-3422 - fix null pointer in usage and action events when
deleting resources whose account has been removed
2013-07-09 09:48:24 -06:00
Kishan Kavala acb4a19633 CLOUDSTACK-2429: Multiple private gateways are allowed within a VPC. Check for conflicting routes in all gateways when adding a new static route 2013-07-09 17:27:06 +05:30
Jayapal e46b90078e CLOUDSTACK-3352 fixed removing previous acl rules when emply acl is applied 2013-07-09 12:50:39 +05:30
Marcus Sorensen 6f9d5db0e3 Summary: update user data on all networks a VM is connected to
Detail: Get list of all nics and update user data on them, rather than just
the default nic for the VM. This makes the results consistent with the password
and SSH key metadata.

BUG-ID: CLOUDSTACK-3408
Bugfix-for: 4.1.1, 4.2.0
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1373345338 -0600
2013-07-08 22:48:58 -06:00
Alena Prokharchyk 833c83d7f7 CLOUDSTACK-3387: deleteTemplate - log the exception message when delete command fails 2013-07-08 15:44:03 -07:00
Alena Prokharchyk f68a74eada CLOUDSTACK-3356: list shared networks available for projects when call is executed by the admin who is not a part of the project 2013-07-08 11:28:15 -07:00
Koushik Das 33ed076969 CLOUDSTACK-3393: Local disk recreated for stopped VM when started
Recreating local disk will result in cleanup of the old disk and this will lead to data loss. So preventing this and bailing out with error. Once migration of local disk is supported then another option is to migrate the existing disk to the new local storage pool.
2013-07-08 17:02:35 +05:30
toshiaki.hatano 814630c542 CLOUDSTACK-3384: CloudStack allow VLAN range between 0-4096. Should be 0-'4095'. 2013-07-08 15:19:12 +05:30
Murali Reddy ea8b85af2a CLOUDSTACK-234: create/delete firewa/lb/pf rule: send ip assoc command
only on first rule is created on the IP and last rule is revoked on the
IP

Current suboptima logic of IP Assoc

 - On associate IP to GuestNetwork there is an IPAssoc command sent to
   corresponding network service providers of the network
 - On every rule apply on IP associated with the network send IP assoc
   to the network service providers
 - On every rule deletion on IP associated with a network sernd IP assoc
   command to the network service providers

With this fix logic of IP assoc is changed as below which eliminates
executio of unnessary and expensive IpAssocCommand resource command

 - On associate IP to GuestNetwork, associate IP only to the network,
   Untill any service is associated with the IP dont send IP Assoc
 - On creation of first rule on the IP send IPAssoc to corresponding
   network service provider. Since IP is used for a service, IPAssoc
   need to be sent to correpondign service provider
 - On deletion of last rule on the IP send IPAssoc to corresponding
   network service provider. When last rule is deleted, IP has no
   service associated with it, so send IP assoc to service provider to
   remove the IP association
2013-07-08 14:52:12 +05:30
Ryan Dietrich 70f33efa72 CLOUDSTACK-3190: Async jobs actions now trigger event bus messages to be
published

-AsyncJobManagerImpl to publish async job events when async jobs are
created, updated and completed
2013-07-05 17:48:25 +05:30
Likitha Shetty 06c8e5bfd8 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-07-05 16:28:24 +05:30
Likitha Shetty 9c5da1c6e3 CLOUDSTACK-3361. [Projects] Allow a normal user to edit public templates created by him. 2013-07-05 16:21:47 +05:30
Wei Zhou f93c51e2bd CLOUDSTACK-3345: createLBStickinessPolicy replaces old stickiness policy if exists 2013-07-05 10:02:29 +02:00
Wei Zhou ac438a6d1d CLOUDSTACK-3372: CapacityManager does not count destroyed volumes when deploy VMs 2013-07-05 09:49:56 +02:00
Hugo Trippaers 41fa79f65c The millisecond to second calculation was done with a bit shift of 10.
This is in effect a division by 1024, while time in ms should be divided
by 1000. The difference of 24 adds up to about a 381 day difference
today. This confuses anybody checking the timestamps in the logs.
2013-07-04 18:39:03 +02:00
Murali Reddy a8a23c4364 CLOUDSTACK-2045:[Multiple IPs Per Nic] This feature is not working well
in case of networks with external devices after GC

adding missing 'retrun false' for isNetworkReadyForGc for the networks
that use external network devices and has secondary IP's associated with
nics.
2013-07-04 21:30:31 +05:30
Kishan Kavala 7a8d7eaa60 CLOUDSTACK-3172: Allow creation of private gateway with same Vlan in different VPCs 2013-07-04 16:11:12 +05:30
Harikrishna Patnala 968c252ca5 CLOUDSTACK-3351: Fix add cluster API to set right hypervisor type
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-04 14:23:08 +05:30
Alex Huang 43ab9506ab Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be. In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent. This makes sense because there's really no reasons why allocators require write access to the database. One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation. 2013-07-03 17:48:53 -07:00
Alena Prokharchyk d8560281a4 CLOUDSTACK-3347: fixed project deletion for project's owned template
Conflicts:
	server/src/com/cloud/template/TemplateAdapterBase.java
2013-07-03 13:48:06 -07:00
Alex Huang bec53fb59a VMSync: Separating jobs from api 2013-07-03 11:22:40 -07:00
Sanjay Tripathi 31df729008 CLOUDSTACK-3184: updateVirtualMachine api gives java NPE.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-03 19:39:02 +05:30
Chip Childers c49674300a Adding license header to server/test/com/cloud/network/security/SecurityGroupManagerImplTest.java 2013-07-03 10:05:29 -04:00
Daan Hoogland 141fbc7ef7 cidr compare fixme addressed 2013-07-03 09:28:49 -04:00
Nitin Mehta 90a15bfff6 CLOUDSTACK-2107
If the scaling up fails on the host the vm is running on try to migrate it to other hosts in the cluster and try scaling.
CLOUDSTACK-3349
For deciding the host in the cluster try the new deployment manager now
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-03 18:40:22 +05:30
Hugo Trippaers 4e823e3a3e Workaround for NPE 2013-07-03 14:59:03 +02:00
Min Chen d425fa76f7 CLOUDSTACK-3335:[Object_Store_Refactor][Automation]CopyTemplate failed
with Unexpected exception.
2013-07-02 18:01:47 -07:00
Prachi Damle 8780fef05a CLOUDSTACK-3047 java.lang.NullPointerException encountered when executing capacityChecker thread.
Changes:
- Added null check around clusterId, since its possible to have null clusterId for storagepool and host records
2013-07-02 16:36:58 -07:00
Min Chen 9a3067fb87 CLOUDSTACK-3314: templates downloaded to S3 should show up in
listTemplates when zoneId is provided.
2013-07-02 15:47:49 -07:00
Alena Prokharchyk 8a0470ee0f CLOUDSTACK-3207: added resourceLimit/resourceCount to the Project API response
Conflicts:
	setup/db/db/schema-410to420.sql
2013-07-02 15:34:08 -07:00