79bfbe32ce
Merge branch 'master' into ui-regions
2013-02-27 08:37:31 -08:00
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
ddd507bccc
Missed commenting the missing allocator.
2013-02-27 20:03:33 +05:30
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
8e360f342d
CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support
2013-02-26 18:39:23 -08:00
b9294daaf1
Add remove region action labels
2013-02-26 16:05:32 -08:00
cf06861c9b
CLOUDSTACK-1387: fix incorrect commit
...
d37ed18c3a
2013-02-26 15:08:30 -08:00
8831b2920c
Implement 'add region' action
2013-02-26 13:27:59 -08:00
142a5a8fba
Implement region list view
2013-02-26 13:09:32 -08:00
d37ed18c3a
CLOUDSTACK-1244: Make sure path exists before copying scripts in client/target
...
This reverts commit cc25e58d
2013-02-26 12:17:38 +05:30
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
cc25e58dc2
move copy scripts after classes folder is created
2013-02-25 14:06:30 -08:00
79fee523bd
CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml
2013-02-22 15:56:54 +08:00
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
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
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
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
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
d81209210c
client: Add baremetal and ucs as dependencies
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 23:52:05 +05:30
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
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
73d5926d0f
CLOUDSTACK-1333: enable logging at Spring startup phase
2013-02-19 20:48:10 -05:00
11d5eadc72
Summary: Re-adjusting tomcat memory settings per Rohit's emails
...
Detail: adjusting MaxPerm to 800, Perm to 512.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361312885 -0700
2013-02-19 15:30:42 -07:00
5b94646d5e
Summary: Increase tomcat servers memory size per dev list discussion
...
Detail: Per Kelven Yang when Javelin was merged into master/4.1, the memory
settings for management server should be a heap of 2g and a max perm size of
512m, due to increased footprint introduced by spring framework/Javelin.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361311099 -0700
2013-02-19 15:00:34 -07:00
edac894f31
spring changes for simulator component
...
allow spring to do DI for simulator plugin. componentContext.xml will
have simulator components disabled by default.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-19 16:40:57 +05:30
295b327281
client: In pom.xml fix jetty:run to include utilities/scripts/db/ in its classpath
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:59 +05:30
9e32fc4c83
maven: Fix stray characted in client/pom.xml introduced in 4572bc06
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-14 16:30:24 +05:30
dfaffcebad
Merge branch 'master' into ui-plugins
...
Conflicts:
ui/index.jsp
2013-02-13 14:03:53 -08:00
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
7401b06cb1
CLOUDSTACK-1070: Don't create HyervisorTemplateAdapter bean, it's already a @Component
...
The issue was completely different than a spring injection issue
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:54:42 +05:30
2293caa32e
moved console proxy into services directory. no code change
2013-02-12 16:00:13 -08:00
22636d520e
Merge branch 'master' into ui-plugins
2013-02-11 11:48:31 -08:00
1896685d83
Slightly upgraded memory requirements, with 128M the server will crash
...
after 30 minuted with an OOM on PermGen
2013-02-11 17:47:35 +01:00
4a96a200b1
Merge branch 'master' into ui-plugins
2013-02-08 13:09:52 -08:00
12cbaad691
Remove duplicate bean for ApiRateLimitServiceImpl to make sure that only
...
one ApiChecker instance is injected in ApiServer.
2013-02-07 21:50:07 -08:00
2cb50b17fb
Merge branch 'master' into ui-plugins
2013-02-07 12:03:35 -08:00
d72e5ffc0f
CLOUDSTACK-1184 Localization - Add Korean label to all locales
2013-02-07 14:05:36 +05:30
bdb904c125
Localization:Korean Translation
2013-02-07 10:34:18 +05:30
9d134f0f19
Summary: We need the integrity checkers to run
...
The EncryptionSecretKeyChecker is required to load db.properties with
encrypted passwords.
Make usre the integrity checkers are run before anything else during
start-up
2013-02-05 23:50:01 +01:00
e5866cf2ef
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:27:57 -08:00
4f274d0b8e
Summary: resizeVolume needs to be available in UI
...
Detail: Adds UI element for resizing a volume
BUG-ID: CLOUDSTACK-644
Reported-by: hongtu_zang@tcloudcomputing.com
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360091087 -0700
2013-02-05 12:04:47 -07:00
0816a0bdea
CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl
2013-02-05 17:18:23 +05:30
fc0bf21a13
CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl
2013-02-05 16:49:34 +05:30
2234e043e2
Summary: update packaging
...
Change some paths to use the new cloudstack name
2013-02-05 10:47:42 +01:00
43dc31bcf2
NiciraNvpElement is loaded twice, but no idea where. This makes it work
...
however
2013-02-04 15:08:58 +01:00
e04d8f3fcf
We don't need logs in out source tree
2013-02-02 11:25:04 +01:00
e74f72be34
Fix the merge conflicts
2013-02-01 15:22:58 -08:00
296c20332d
Merge javelin into master
2013-02-01 14:40:45 -08:00
7b75f0d990
Sync master to javelin one more time
2013-02-01 11:37:33 -08:00
736b236eaf
bigswitch controller support
...
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +05:30
Brian Federle
Noa Resare
Prasanna Santhanam
Edison Su
Min Chen
Rohit Yadav
frank
Edison Su
Mice Xia
Kelven Yang
Marcus Sorensen
Alex Huang
Hugo Trippaers
Pranav Saxena
Channy Yun
Hugo Trippaers
Kishan Kavala
Kanzhe Jiang