916 Commits

Author SHA1 Message Date
Min Chen
9f47466fea Fix some issues in renaming iam api, also fix marvin library. 2014-02-26 17:30:34 -08:00
Min Chen
b78cb2284a Add marvin integration test for list VM. 2014-02-21 15:35:48 -08:00
Min Chen
3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Hugo Trippaers
28ac2f758e Every tar has it's own way of doing things 2014-02-05 11:48:53 +01:00
Hugo Trippaers
3df97bd663 Sync systemvm and systemvm64 build instructions 2014-02-05 11:21:23 +01:00
Hugo Trippaers
0ce488849d CLOUDSTACK-5932: update the definitions with the new debian version 2014-02-05 10:52:36 +01:00
Abhinandan Prateek
18191ce79a CLOUDSTACK-5932: updated script with the valid iso download urls 2014-02-05 10:38:26 +01: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
Abhinandan Prateek
d578d7ef85 update packages list before getting jre 7
(cherry picked from commit 5121f8cd4e4adcdf23b6ec25cb1c28bec8f417a7)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-01-31 09:42:31 +01:00
Abhinandan Prateek
0685371179 updating the jre to version 7 on system vms
(cherry picked from commit fc2e7ec70a1cc48a10a168ec3df607b49a7bcdf6)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-01-31 09:41:41 +01:00
Alena Prokharchyk
13e6c2fe72 Fixed API doc that got broken by adding new commands for stratosphere ssp plugin
Conflicts:
	tools/apidoc/gen_toc.py
2014-01-30 11:01:03 -08:00
Hugo Trippaers
c2da280347 Add a zipped version of the hyperv image that we can store in the archives on the jenkins server 2014-01-23 09:06:33 +01:00
Min Chen
33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Min Chen
929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Hugo Trippaers
ecf57c368a Adjust values for this version of vbox 2014-01-17 17:23:46 +01:00
Hugo Trippaers
50054fe060 Namespaces are important 2014-01-17 16:00:10 +01:00
Milamber
cb7b1dc276 Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
Conflicts:
	client/WEB-INF/classes/resources/messages_es.properties
	client/WEB-INF/classes/resources/messages_pt_BR.properties
2014-01-17 11:15:09 +00:00
Alena Prokharchyk
dcf9607a46 Fixed code style errors breaking the build 2014-01-16 14:05:20 -08:00
Hugo Trippaers
da8ee45a24 Why is the easy solution always to hard 2014-01-16 17:27:13 +01:00
Hugo Trippaers
95a92ad2e3 Fix typo in convert call 2014-01-16 16:41:46 +01:00
Hugo Trippaers
5d24843ef5 Proper cleanup before the next build of the systemvm 2014-01-16 16:03:56 +01:00
Hugo Trippaers
bf26efc551 Little hack until we can install xsltproc on the buildslave 2014-01-16 15:33:05 +01:00
Hugo Trippaers
794d47c5f2 CLOUDSTACK-5883 Convert ovf file to proper format for ESXi 2014-01-16 14:43:44 +01:00
Santhosh Edukulla
3a3d8f27dd Fix for CLOUDSTACK-5864
Fixed the mentioned issue.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2014-01-15 11:45:58 +01:00
Ashutosh K
c108d7f0d0 CLOUDSTACK-2237: Automation-Adding next set of test cases for feature - SG in advanced zone 2014-01-14 14:34:21 +05:30
SrikanteswaraRao Talluri
c98ac9aae0 CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template in ready state with
matching given ostype
2014-01-10 19:56:38 +05:30
Min Chen
c69a412c43 Remove old prepareSecondaryStorageForMigration from gen_toc.py. 2014-01-09 10:12:22 -08:00
Hugo Trippaers
7c8facf3c9 Change checkstyle to run on every sub project, so it will also run when you build an individual module 2014-01-09 17:00:11 +01:00
Hugo Trippaers
1b5f8e21a9 Fix typo 2014-01-09 14:42:34 +01:00
SrikanteswaraRao Talluri
3baf61161a CLOUDSTACK-5846: added updateCloudToUseObjectStore to known_category dict in gen_toc.py
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-01-09 18:44:04 +05:30
Hugo Trippaers
d56a962445 Radvd is needed in the template so we can start testing with IPv6 2014-01-09 12:33:55 +01:00
Gaurav Aradhye
b98c0ee809 CLOUDSTACK-5630: Fixed snapshots' test cases 2014-01-08 17:16:06 +05:30
SrikanteswaraRao Talluri
249993b2f1 CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template
by default
2014-01-07 17:41:36 +05:30
Ashutosh K
4d9b95e13d CLOUDSTACK-2237: Automation - Adding new test cases for security group in advanced zone feature 2013-12-27 16:06:34 +05:30
Rajesh Battala
fc306d13bf CLOUDSTACK-5602 cloudstack-release file in systemvm for hyperv is showing the release as 4.2. It should be 4.3
CLOUDSTACK-5538 additional libraries requires in systemvm for console proxy to work in HyperV
2013-12-27 14:58:23 +05:30
Girish Shilamkar
b544669a84 CLOUDSTACK-5497: Fix test_guest_vlan_range.py to get free vlan range 2013-12-24 11:11:17 +05:30
Daan Hoogland
3da5de545e create a (mini-)branch instead of creating a commit to revert 2013-12-23 14:35:29 +01:00
Gaurav Aradhye
a160b46cd4 CLOUDSTACK-4780: Changes related to checking snapshot path
on NFS server, also made marvin import paths specific
2013-12-23 17:58:51 +05:30
Girish Shilamkar
fde14bcc32 Revert "CLOUDSTACK-4780: Changes related to checking snapshot on NFS server"
This reverts commit 33fb241fdf7f363659db918b8f6dd5744f599259.
2013-12-21 12:47:32 +05:30
Alex Huang
c2baed665b Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies 2013-12-20 17:21:34 -08:00
Gaurav Aradhye
33fb241fdf CLOUDSTACK-4780: Changes related to checking snapshot on NFS server 2013-12-19 10:21:33 +05:30
Alena Prokharchyk
eb9147f709 Fixed code style errors in cloud-apidoc project 2013-12-12 16:39:02 -08:00
SrikanteswaraRao Talluri
8374ff591d CLOUDSTACK-5449: fixed pep8 errors
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-12-12 17:10:37 +05:30
Abhinandan Prateek
bbeb164abf CLOUDSTACK-5259: added 32 bit support for vhd-util 2013-12-12 14:48:08 +05:30
Santhosh Edukulla
e498bf00d4 CLOUDSTACK-5443: Fixed the issue. 2013-12-11 19:37:29 +05:30
Santhosh Edukulla
ab025f0269 Fixed CLOUDSTACK-5436
Fixed few RAT issues reported for new additions of files to repo.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-12-11 15:33:52 +05:30
SrikanteswaraRao Talluri
a9d96aff06 CLOUDSTACK-5449: fix the log creation failure case and added an option
for user to provide --log-folder-path=

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-12-11 01:57:44 +05:30
Santhosh Edukulla
3144e01c13 CLOUDSTACK-5423: Fixed 5423 2013-12-10 20:25:23 +05:30
Girish Shilamkar
a55f108285 CLOUDSTACK-5405: Changed marvin to create sg in account into which vm is deployed 2013-12-10 00:27:49 -05:00
tuna
015ab6af8a fix rebase master 2013-12-09 23:33:14 +07:00