apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,418 Commits 311 Branches 325 Tags
Commit Graph

7958 Commits

Author SHA1 Message Date
Min Chen
7c0170e3e9 Hook up IAM update for updateTemplatePermission api. 2014-02-05 16:04:13 -08:00
Prachi Damle
9e92197dfd Fixing Build after merge 2014-02-04 15:10:24 -08:00
Prachi Damle
f84375442e Merge branch 'master' into rbac 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
 2014-02-04 12:07:32 -08:00
Prachi Damle
72c0f1a617 Remove trailing whitespace 2014-02-03 18:28:09 -08:00
Prachi Damle
cb4d3a3c54 Support deleteAffinitygroup - remove access 2014-02-03 18:22:57 -08:00
Prachi Damle
022b9b8f80 Add access for domain wide createAffinityGroup 2014-02-03 18:14:56 -08:00
Prachi Damle
939b15169c changes to support the domain wide resources for Network 2014-02-03 17:34:03 -08:00
Prachi Damle
7d0472bdaa CLOUDSTACK-5995 ; change service offering is not honouring host tags 
- Check host tag when the lastHostId is set.
 2014-01-31 12:02:44 -08:00
Alena Prokharchyk
48361d8a8b Fixed listAutoScaleVmGroups: used to return incorrect value in lbruleid field (wrong parameter was used when search in firewall_rules table - profileId instead of lbRuleId) 2014-01-31 09:21:55 -08:00
Sanjay Tripathi
e8438f1b6d CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75 
and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts"  message while deleting multiple events .
 2014-01-31 17:10:04 +05:30
sbalineni
ed3e1b95b0 VPC Support for contrail networking 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2014-01-30 18:13:48 -08:00
Nitin Mehta
0e2e6995b7 CLOUDSTACK-5997: 
Template state changes side affects
 2014-01-30 17:59:55 -08:00
Alena Prokharchyk
02bdb28d76 Resource metadata support for autoscale vm group object 2014-01-30 13:04:56 -08:00
Alena Prokharchyk
cb073e0634 listAutoscaleVmProfiles: added zoneId to the list of optional api parameters 2014-01-30 12:36:56 -08:00
David Grizzanti
5de9ae0bce CLOUDSTACK-5496 : Account included in ActionEvents is Project Account ID 
When Action Events are generated and placed on the Event Bus, an
"account" parameter is included with the event. When these events are
generated for resources within projects, this "account" parameter is not
useful as it's the UUID of the project account, instead of the project.

To solve this, I updated ActionEventsUtil class to include a "project"
parameter in the generated events when the resource is being
changed/add/deleted in a project.
 2014-01-30 17:35:01 +05:30
Saksham Srivastava
85d0f8f93a CLOUDSTACK-5916: associateIpAddress leaves an IP in allocating state 2014-01-30 17:11:02 +05:30
Sanjay Tripathi
20fd2769a9 CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"". 2014-01-30 16:29:18 +05:30
Alena Prokharchyk
b38c033d5c LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller 2014-01-29 17:12:46 -08:00
Alena Prokharchyk
37fa8012f8 Resource metadata for autoscaleVmProfile - forgot to add dao mapping to the ResourceMetaDataManagerImpl 2014-01-29 14:57:01 -08:00
Alena Prokharchyk
65c5de1cb6 Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url' 2014-01-29 14:57:01 -08:00
Alena Prokharchyk
fdb25d6f5b Resource metadata support for autoscaleVmProfile CS object 2014-01-29 14:57:00 -08:00
Daan Hoogland
920163f24f findbugs: possible nulpointer derefs 2014-01-29 13:09:17 +01:00
Daan Hoogland
ee1e8a6c2a findbugs: use system account id instead of null (security considerations 
to be made here)
 2014-01-29 12:36:34 +01:00
Daan Hoogland
fef2daf5d4 findbugs: compare strings with equals() 2014-01-29 12:06:34 +01:00
Min Chen
0063b60701 Remove ACL permission for a particular entity when it is deleted. The 
hook is currently only done for deleteTemplateCmd.
 2014-01-28 18:17:01 -08:00
Min Chen
72812cdf22 Grant public template permission to domain admin and normal user policy. 2014-01-28 17:41:27 -08:00
Daan Hoogland
bd2acd1eff findbugs: comparison of wrapper objects 2014-01-28 23:20:45 +01:00
Prachi Damle
91317dc497 Changes for createDomain - create new group AND createAccount - add account to domain group 2014-01-28 09:48:19 -08:00
Marcus Sorensen
29e22384b7 fix checkstyle in DedicatedResourceVO.java, trailing space 2014-01-28 10:38:30 -07:00
Daan Hoogland
53777c9523 findbugs: removed obfuscating fields(cherry picked from commit 
9495c68c1378e379880433d45ec43bfda75ec3f9)
 2014-01-28 17:42:17 +01:00
Daan Hoogland
be21822cba findbugs: throw exceptions when found(cherry picked from commit 
9772693dca9a91a438078de11b1be1e6044aa6f3)
 2014-01-28 17:39:02 +01:00
Daan Hoogland
5d8e8fd3a2 findbugs: nullpointer guards and wrappertype comparisons(cherry picked 
from commit 791b7f8f7fe8f7d342e46fbb61a3f421e87fca59)
 2014-01-28 16:46:05 +01:00
Daan Hoogland
9edeb24f3f findbugs: assign result of string manipulations(cherry picked from 
commit 20127e09dc0e341a2f790a8a52cded4c5f1f0cc1)
 2014-01-28 16:36:27 +01:00
Daan Hoogland
fae0556021 Findbugs: different issues solved(cherry picked from commit 
0b13f8e59db1e681e1dff0baa828bb0711842e9f)
 2014-01-28 16:30:04 +01:00
Daan Hoogland
0daca84eff findbugs: removed fields injected in parent(cherry picked from commit 866a539b067663b346bd8d087c578987a86fe834) 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2014-01-28 15:59:04 +01:00
Daan Hoogland
a16759a9b1 findbugs: byte[].toString -> Arrays.toString(byte[])(cherry picked from commit 23a3d99fc0836839a88584d7aa6a978d99c5d126) 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2014-01-28 15:51:08 +01:00
Daan Hoogland
44bc2beb14 findbugs: null-checks(cherry picked from commit 
c58e509924e97dfced80981da5c27b9f3aae9b33)
 2014-01-28 15:44:04 +01:00
Daan Hoogland
fe262caa75 findbugs: retrieve the objects to remove from the collection(s) 2014-01-28 15:36:40 +01:00
Daan Hoogland
53feecaa76 findbugs: null check for gateway and netmask instead of gateway 
twice(cherry picked from commit
d30ddf6d59732fa30855811e7fe0aa639ee3849a)
 2014-01-28 14:53:11 +01:00
Daan Hoogland
a71871d11c findbugs: fixes for ApiServer, ApiSerializerHelper and 
ApiXmlDocWriter(cherry picked from commit
9aced41d708acd22b43ef0e512fa2cc657a6c0a2)
 2014-01-28 14:47:06 +01:00
Daan Hoogland
1c7361756c Findbugs: scariest issues in ApiResponseHelper fixed (cherry picked from 
commit 9a1b882d0eb871c64fe0f0f3fbafbabae89188fa)
 2014-01-28 14:24:21 +01:00
Daan Hoogland
60e8d131cf findbugs: moved call on static object to synchronized block(cherry 
picked from commit f3529a19a9aad36dbd92e311018643629f19c748)
 2014-01-28 14:14:47 +01:00
Daan Hoogland
9eae5f6929 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git 2014-01-28 13:49:42 +01:00
Daan Hoogland
4f6638d7c7 findbugs: nullpointer dereference guarded(cherry picked from commit 
43ba36f97950aa8d09399a28bb50c6a22209f15e)
 2014-01-28 13:49:14 +01:00
Likitha Shetty
95bd04e449 CLOUDSTACK-5965. VM displayname is not returned by API. 
If user doesn't supply a display name during VM launch, default it to VM name(uuid) in listVM response.
 2014-01-28 16:43:12 +05:30
Rajesh Battala
807dc09138 CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV 2014-01-28 07:03:08 +05:30
Min Chen
f77974b5d2 Fix trailing whitespace from cherry-pick 2014-01-27 13:31:35 -08:00
Min Chen
cfe7864618 CLOUDSTACK-5960: Domain admin or user cannot register a template using 
S3/Swift object store.
 2014-01-27 13:31:35 -08:00
Marcus Sorensen
0502d2f375 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged 
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
 2014-01-27 12:11:18 -07:00
Sanjay Tripathi
b25ee92c34 CS-5950: Wrong storage tags are used for ISO deployed VMs. 2014-01-27 16:58:55 +05:30