etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,125 Commits 342 Branches 328 Tags 949 MiB
Commit Graph

1265 Commits

Author SHA1 Message Date
Hugo Trippaers f0cae6de61 Small temporary fix on 422d9b8daf 2013-06-27 18:52:17 -07:00
Alex Huang 422d9b8daf Disabled ssp plugin because I don't have the db 2013-06-27 15:43:02 -07:00
Alex Huang 262352a1c6 Another merge from master to bring over fixes to bugs that broke the bvt 2013-06-27 11:16:32 -07:00
Ian Duffy c214b47764 Add jetty stop function to cloudstack client 2013-06-26 11:13:15 -04:00
Hiroaki KAWAI 39ef9240e8 CLOUDSTACK-3194 fix stratosphere ssp plugin packaging 
stratosphere-ssp plugin maven pom.xml has some bad settings
and client pom.xml requred dependency for it.
 2013-06-26 12:36:01 +09:00
Alex Huang 5bd65daa03 How did these things actually pass in master 2013-06-25 13:32:37 -07:00
Alex Huang e6229656c1 Took out netapp support which hasn't worked for a long time 2013-06-25 13:31:25 -07:00
Kelven Yang ef1ec1e3cd Enable nonoss building 2013-06-25 11:49:41 -07:00
Pranav Saxena c6d361184b Updated japanse and chinese localization files 2013-06-25 23:25:38 +05:30
Hiroaki KAWAI 2d6369c826 CLOUDSTACK-2756: Stratosphere SSP plugin 
Stratosphere SSP is an SDN solution which creates virtual L2
networks backed by vxlan and vlan. SSP will ask hypervisor to set a
specific vlan, then SSP will interact with openflow switches and
put vxlan/vlan translation flow rules.

This plugin provides SSP as "connctivity" service provider.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
 2013-06-25 15:31:40 +09:00
Alex Huang 049dd7242e merge from head 2013-06-24 16:51:59 -07:00
Alex Huang 7b7db0560c merge is complete 2013-06-24 16:50:31 -07:00
Kelven Yang e7c34793fe Fix unit test issue in non-oss build, temporarily disable dipendency of external network-elements like F5, NetScalar 2013-06-24 12:19:02 -07:00
Sheng Yang 759269fcd8 Baremetal: Fix API's packages and categories 2013-06-21 09:48:30 -07:00
Sheng Yang a18513286a Baremetal: Re-enable baremetal component 2013-06-21 09:47:02 -07:00
Sheng Yang f37b089fce Revert "Removing baremetal related references" 
This reverts commit 99ea4011b1.

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
 2013-06-21 09:46:56 -07:00
Pranav Saxena 9b70828e28 Merge remote-tracking branch 'remotes/origin/cloudstack-globalization' 2013-06-21 17:31:45 +05:30
Pranav Saxena 0c5182da0a spell error 2013-06-21 17:28:21 +05:30
Min Chen 2f9ba709a5 Add listCacheStoresCmd api for UI to list cache stores. 2013-06-20 18:06:30 -07:00
Edison Su 6b9ea1761a CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage 2013-06-20 17:51:11 -07:00
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Alex Huang e2edae1711 Merge from master 2013-06-17 19:00:44 -07:00
Alex Huang 8f00c19192 Finally, we moved AsyncJobManagerImpl out of server package 2013-06-17 17:04:05 -07:00
Pranav Saxena e009560927 Simplified Chinese file for CS globalization 2013-06-17 15:54:25 +05:30
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Edison Su c2da4eac89 fix NPE for cache ref cnt 2013-06-14 17:24:31 -07:00
Edison Su a715eb8121 clean up storage related code, and add lru replacement algorithm for cache storage 2013-06-14 15:55:59 -07:00
Min Chen bb85a564da Remove state from vm_template table, we should use template_store_ref 
state column to represent the state of a template in each zone.
 2013-06-14 15:14:09 -07:00
Pranav Saxena 8675fe89c0 Japanese globalization properties file 2013-06-14 15:25:07 +05:30
Devdeep Singh 201c0651cc CLOUDSTACK-2948, Explicit dedication processor wasn't added to nonoss components context xml. The processor was never picked up to evaluate which hosts to avoid during deployment. Adding the explicit processor to the list of available processors. 2013-06-14 13:16:21 +05:30
Kelven Yang 2892469cf4 Fix recent changes in DeploymentPlanner 2013-06-12 15:30:24 -07:00
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit 
c30d9be3ce) into object_store.
 2013-06-12 11:20:32 -07:00
Alex Huang aaa16af211 Merged from master 2013-06-09 17:53:27 -07:00
Hiroaki KAWAI 78196384ae CLOUDSTACK-2758: touch file for tomcat6 package change CVS 2013-1976 
catalina.out must be prepared by package installation.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-05 17:00:47 +05:30
Prasanna Santhanam 5bfe2f99d7 Enable the bean for network manager 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-05 12:37:41 +05:30
Brian Federle dfdb8a967e CLOUDSTACK-1742: Better text labels for secondary IP UI 2013-06-04 16:06:48 -07:00
Brian Federle e883526449 CLOUDSTACK-1763: Better confirm message for acquire NIC IP 2013-06-04 15:25:50 -07:00
Alex Huang dd11254087 further refactored jobs 2013-06-04 13:54:33 -07:00
Alex Huang 51f533e97a changes to jobs 2013-06-04 11:02:16 -07:00
Alex Huang 688b047c2a Made it all work on startup 2013-06-03 17:10:28 -07:00
Prasanna Santhanam db655ae8c7 CLOUDSTACK-2810: Include new vmware APIs in discovery 
Discovery plugin will detect APIs from pluggable services and map them
to those in commands.properties. Including the latter to complete the
mapping so listApis now returns these APIs.

Also included fix for API docs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-03 22:11:03 +05:30
Prasanna Santhanam 767ed065c5 CLOUDSTACK-2815: Include dedication in simulator context 
SimulatoComponentContext need sto include the dedicated resource manager
to see the commands/apis exposed by it.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-03 21:51:18 +05:30
Prasanna Santhanam 14782dbc24 CLOUDSTACK-2815: include dedicated resources in non-oss 
dedicated resources don't load in the non-oss context without this

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-03 16:30:16 +05:30
Prasanna Santhanam 2f51bcf2a8 CLOUDSTACK-2815: org.apache.cloudstack.dedicated.* to org.apache.cloudstack 
Moving the package one level up so API discovery can discovery APIs from
org.apache.cloudstack.api.* This also keeps the plugin uniform with the
other plugins which have their APIs in org.apache.cloudstack.api
namespace.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-03 16:21:47 +05:30
Prasanna Santhanam 54127f838e CLOUDSTACK-2758: Fix permissions of catalina.out 
Because of CVE 2013-1976, catalina.out gets owned by root. Since
cloudstack-management is run under a privileged user env. of cloud have
cloud ($TOMCAT_USER) own the catalina.out.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-03 13:54:52 +05:30
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling" 
This reverts commit 6dad8adf8f.
 2013-06-03 07:48:03 +02:00
Sateesh Chodapuneedi 984b59d1ee CLOUDSTACK-2701 
Moved bean VmwareStorageMotionStrategy to nonossComponentContext.xml.in
 2013-06-03 10:03:36 +05:30
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00