apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,043 Commits 312 Branches 325 Tags
Commit Graph

1244 Commits

Author SHA1 Message Date
Chip Childers
bd4508589b Revert "CLOUDSTACK-874 Ability to delete Events and Alerts" 
This reverts commit 5e4c2c8a9eb339fb467aea15582a79cd2feef4bf.
 2013-03-08 14:28:23 -05:00
Sanjay Tripathi
5e4c2c8a9e CLOUDSTACK-874 Ability to delete Events and Alerts 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-03-08 10:52:40 -08:00
Milamber
38aec6fc4d CLOUDSTACK-465 - French language file quotes are dropping javascript syntax errors 2013-03-06 06:09:16 -05:00
Kelven Yang
333dd810d2 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-03-05 19:03:30 -05:00
Prasanna Santhanam
b683c34d3f Fix the typo in componentContext.xml.in 
HypervisorTemplateAdapter was mispelt causing server to not startup.

Reported-by: Dave Cahill <dcahill@midokura.net.jp>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-03-05 13:51:06 +05:30
Min Chen
613a061977 Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
 2013-03-04 17:32:52 -08:00
Alena Prokharchyk
7a54458e17 CLOUDSTACK-1502 Fixed the api-doc build component caused by new API commands: 
addIpToNic
removeIpFromNic
listNics

1) Removed trailing whitespaces from commands.properties file for the commands above
2) Created a new category "Nic" in gen_toc.py for the new commands
 2013-03-04 16:19:08 -08:00
Hugo Trippaers
d922f6fd4b CLOUDSTACK-1304 Set permissions using the chmod ant task 2013-03-04 21:03:15 +01:00
Nitin Mehta
b12aebefee Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes" 
This reverts commit e0019eccd997d9b2b3ff9395bcd99f821f5121db.
 2013-03-04 23:32:52 +05:30
Nitin Mehta
e0019eccd9 CLOUDSTACK-658 - Adding Scalevm command and XS related changes 2013-03-04 14:47:55 +05:30
Jayapal Uradi
aedb8c478e CLOUDSTACK-24: mipn feature for isolated and vpc networks 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 https://issues.apache.org/jira/browse/CLOUDSTACK-24
 2013-03-04 11:02:09 +05:30
Min Chen
8b9c45b96d Merge branch 'master' into vim51_win8 
Conflicts:
	setup/db/db/schema-40to410.sql
 2013-03-01 16:46:58 -08:00
Hugo Trippaers
2eae9a1390 Summary: few fixes to the pom 
Only one dependency to the ovm hypervisor is enough

Depend on the right jna package
 2013-03-01 20:52:17 +01:00
Abhinandan Prateek
14791a9d8f Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes." 
This reverts commit f9d96c9169a50917143914ffb53e227c8673c50f.
 2013-03-01 22:29:47 +05:30
Jayapal Uradi
f9d96c9169 CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes. 2013-03-01 16:40:26 +05:30
Likitha Shetty
f1249b353e CLOUDSTACK-1450. AWSAPI server fails to start. 
Missing annotation @Component in CloudStackUserDao implementation
 2013-03-01 15:23:39 +05:30
Hugo Trippaers
9f2a2081b5 Avoid the use of operating system specific functions, actually avoid 
exec as much as possible.
 2013-03-01 08:20:40 +01:00
frank
bd0fc2f354 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh

Conflicts:

	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
 2013-02-28 15:42:48 -08:00
Min Chen
801e5269ea Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08:00
Min Chen
6f19895191 Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion. 
Confirmed with Kishan about this.
 2013-02-28 14:17:58 -08:00
Hugo Trippaers
97ca7791b3 Don't load from a fixed path, but load from the classpath so admins or packagers can overwrite the logging config 2013-02-28 21:28:46 +01:00
Noa Resare
9801667199 Revert classpath.conf.in to before .deb packaing merge 
This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
 2013-02-28 19:45:46 +00:00
Mice Xia
e5bf4a8fc4 CLOUDSTACK-1434 BeanCreationException: Error creating bean with name 'apiRateLimitServiceImpl' when starting up mgmt server 2013-02-28 11:49:12 +08:00
Min Chen
93f14e7c65 Merge branch 'master' into vim51_win8 
Conflicts:
	client/tomcatconf/componentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/test/com/cloud/vmware/TestVMWare.java
 2013-02-27 17:47:10 -08:00
Min Chen
36f4b44c36 Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in 
new Spring framework and register it into internal dao map.
 2013-02-27 15:47:07 -08:00
Brian Federle
79bfbe32ce Merge branch 'master' into ui-regions 2013-02-27 08:37:31 -08:00
Noa Resare
2f135be15f CLOUDSTACK-1415: Debian & Ubuntu packaging work 
Some concepts included:

* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
 2013-02-27 15:44:46 +00:00
Prasanna Santhanam
ddd507bccc Missed commenting the missing allocator. 2013-02-27 20:03:33 +05:30
Prasanna Santhanam
d68b6c3e54 temporary fix: autowriring failing for missing storage allocator 
The storage allocator beans were given with the wrong package namespace
of com.cloud and not org.apache.cloudstack. Removed and correctedt the
namespace. Server coems up successfully.

Edison to revisit and complete the fix.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-02-27 20:01:16 +05:30
Edison Su
8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
Brian Federle
b9294daaf1 Add remove region action labels 2013-02-26 16:05:32 -08:00
Min Chen
60cd4dd09e Merge branch 'master' into vim51_win8 2013-02-26 15:14:45 -08:00
Min Chen
cf06861c9b CLOUDSTACK-1387: fix incorrect commit 
d37ed18c3aff4fe522adb803322ba912819c73da.
 2013-02-26 15:08:30 -08:00
Min Chen
8aba25f18d Merge branch 'master' into vim51_win8 
Conflicts:
	setup/db/db/schema-410to420.sql
 2013-02-26 14:12:36 -08:00
Brian Federle
8831b2920c Implement 'add region' action 2013-02-26 13:27:59 -08:00
Brian Federle
142a5a8fba Implement region list view 2013-02-26 13:09:32 -08:00
Rohit Yadav
d37ed18c3a CLOUDSTACK-1244: Make sure path exists before copying scripts in client/target 
This reverts commit cc25e58d, let's explicitly make sure that paths exists.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-26 12:17:38 +05:30
frank
c1d513ef12 CloudStack CLOUDSTACK-1382 
vm deploy fails with Error "cannot find DeployPlannerSelector for vm"

adding configuration of DeployPlanSelector to nonossComponentContext.xml.in
fixed resolved
 2013-02-25 16:07:50 -08:00
Min Chen
39af8a3a16 Merge branch 'master' into vim51_win8 2013-02-25 14:18:21 -08:00
Edison Su
cc25e58dc2 move copy scripts after classes folder is created 2013-02-25 14:06:30 -08:00
Min Chen
fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Mice Xia
79fee523bd CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml 2013-02-22 15:56:54 +08:00
Rohit Yadav
e0008844df client: Remove duplicate baremetal dependency, regression from 1f15c1e9 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-22 11:38:54 +05:30
frank
15ead099a1 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-02-21 15:48:08 -08:00
frank
55b77c7c8f CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

adding missing scripts back

Conflicts:

	client/pom.xml
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
 2013-02-21 15:46:11 -08:00
frank
1f15c1e9e7 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base

Conflicts:

	client/tomcatconf/componentContext.xml.in
 2013-02-21 15:42:38 -08:00
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Rohit Yadav
d81209210c client: Add baremetal and ucs as dependencies 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-21 23:52:05 +05:30
Rohit Yadav
16f51227c6 client: Fix web.xml string processing based on profile, oss or nonoss 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-21 23:52:05 +05:30
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:56 +05:30