16210 Commits

Author SHA1 Message Date
Edison Su
020be66f9d add copy volume and create volume from snapshot 2013-02-21 11:22:49 -08:00
Edison Su
621a779446 use correct disk offering id 2013-02-21 11:22:49 -08:00
Edison Su
0b86b33c56 rebase to master 2013-02-21 11:22:48 -08:00
Edison Su
ec09e34f86 fix downloading template 2013-02-21 11:22:48 -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
Parth Jagirdar
8134885e2d CLOUDSTACK-1180: UI test automation using selenium
Description:
	Adding selenium test scripts.
2013-02-21 12:04:18 -05:00
Hugo Trippaers
368a5d5a9a Prachi's commit 20a747601c2664b2b8128f7a180f7e94f6b0b1e1 introduced a
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4590775eff6291ddfbbd6de777d1b63)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-21 14:08:56 +01:00
Pranav Saxena
82c2e3052e Merge branch 'Reset-VM' 2013-02-21 16:29:42 +05:30
Pranav Saxena
35d8905081 Reset a VM detail view display 2013-02-21 16:26:31 +05:30
Pradeep Soundararajan
3279b41465 Commit review 9409 Added a global package name in the packaging script
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-21 10:40:16 +01:00
Harikrishna Patnala
6c01b62cdc CLOUDSTACK-667: VM's base image update facility 2013-02-21 15:04:29 +05:30
Rohit Yadav
59db01ce6e CLOUDSTACK-1347: Don't enforce not null rule on queue_proc_time of sync_item_queue
In c63dbb88042d7eabea2664c2b608c51792fc9f18 I removed the rule from create-schema:
-  `queue_proc_time` datetime COMMENT 'when processing started for the item',

But, upgrade path schema-40to410.sql had a different rule which caused the bug:
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL
COMMENT 'when processing started for the item' AFTER `queue_proc_number`;

In this fix we just revert to whatever rule was defined in create-schema as the
developer may have forgetten to fix same rule in create-schema and upgrade path.
This commit can be reverted or the code be fixed if we want that queue_proc_time
cannot be null.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 15:01:00 +05:30
Harikrishna Patnala
7a3f072a50 CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-02-21 14:59:35 +05:30
hongtu_zang
f7b600b439 CLOUDSTACK-1334 global config vmware.root.disk.controller doesn't work 2013-02-21 11:29:08 +08:00
Sheng Yang
99653ea328 IPv6: Update java-ipv6 dependency to 0.10 2013-02-20 18:41:58 -08:00
Prachi Damle
744c24ee68 CLOUDSTACK-1346: Check to see if external devices are used in the network, is hardcoded for specific devices
- Changes the check to list all providers of a network and check if it is an external provider
2013-02-20 15:37:27 -08:00
Jessica Wang
48ec4395bd CLOUDSTACK-1343: cloudstack UI - baremetal - enable baremetal providers who are selected in the network offering. 2013-02-20 15:13:46 -08:00
Alex Huang
b176654b19 CLOUDSTACK-1273: Fixed the problem with the paths on the systemvm 2013-02-20 12:37:34 -08:00
Prachi Damle
70ac773f69 CLOUDSTACK-1344 Typo in use.external.dns setting description
Fixed the typo.
2013-02-20 11:58:14 -08:00
Chip Childers
6c9eb6c11c Updating the java-ipv6 legal docs to reflect the newly added NOTICE and copyright statements for version 0.10
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-20 14:50:36 -05:00
Prachi Damle
ec1f48a4b2 CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
2013-02-20 11:23:32 -08:00
Chip Childers
476ad0be62 CLOUDSTACK-1341: Corrected the URL for the KEYS file
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-20 10:13:45 -05:00
radhikap
a223691e02 cloudstack-806
Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
2013-02-20 10:01:24 -05:00
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
Rohit Yadav
1121977513 packaging: Don't depend on cloudstack snapshot version, copy using wildcard path
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:51 +05:30
Rohit Yadav
35b83b2adc CLOUDSTACK-1317: In DatabaseUpgradeChecker, add upgrade path to 4.2.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:27 +05:30
Rohit Yadav
c8a2eb5387 CLOUDSTACK-1312: Remove remaining db schema diversions since 4.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 15:52:44 +05:30
Chiradeep Vittal
091682cf67 CLOUDSTACK-1066: remove useless config.dat 2013-02-19 23:36:08 -08:00
Sheng Yang
483a11ce95 IPv6: Fix build of master
All the table column should be modified before view was added
2013-02-19 21:13:12 -08:00
Kelven Yang
73d5926d0f CLOUDSTACK-1333: enable logging at Spring startup phase 2013-02-19 20:48:10 -05:00
Sheng Yang
4d80b71ec0 IPv6: Revoke the change of create-schema.sql
The change is in scheme-40to410.sql now.
2013-02-19 16:46:03 -08:00
Kelven Yang
2b76114bba CloudStack-1267: initialize log4j in agent main() 2013-02-19 19:24:20 -05:00
Sheng Yang
817548bac1 IPv6: Add ipv6 for user vm view 2013-02-19 15:50:55 -08:00
Sheng Yang
da75e4ac8a IPv6: Add IPv6 for domain router view 2013-02-19 15:50:23 -08:00
Prachi Damle
8296d41b5b CLOUDSTACK-1330: ec2-run-instances - When -n option is used to deploy multiple Vms API returns error even though few of the Vms have been deployed successfully.
Changes:
- Instead of throwing out error, return the response containing the info about the instances that were launched.
2013-02-19 15:12:06 -08:00
Marcus Sorensen
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
Marcus Sorensen
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
Sheng Yang
05069bb4d9 Add db upgrade path for ipv6 2013-02-19 12:10:09 -08:00
Chip Childers
9333f979db Adding legal docs for esapi-2.0.1.jar to the package LICENSE
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-19 13:50:09 -05:00
Chip Childers
58bcd0eefb Adding springsource artifacts to package legal docs.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-19 13:22:42 -05:00
Chip Childers
e4baff2281 Adding legal docs for java-ipv6.jar
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-19 13:00:11 -05:00
Chip Childers
018554ce29 Fixed strange duplication of content within the tools/whisker/LICENSE
file.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-19 12:57:25 -05:00
Gavin Lee
07102fc8ab CLOUDSTACK-1318:Fix build devcloud issue 2013-02-19 23:22:16 +08:00
Pranav Saxena
fb689e77f1 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-02-19 16:47:52 +05:30
Pranav Saxena
cead6d2fcf Merge branch 'LDAP-UI' 2013-02-19 16:44:28 +05:30
Prasanna Santhanam
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
Pranav Saxena
bff3d8ac9a LDAP-UI integration code 2013-02-19 16:40:47 +05:30
Abhinandan Prateek
f2b97db0f9 CLOUDSTACK-1172: LDAP enhancements 2013-02-19 15:36:39 +05:30