etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,700 Commits 323 Branches 325 Tags 912 MiB
Commit Graph

36700 Commits

Author SHA1 Message Date
Laszlo Hornyak 1f72548f57 CLOUDSTACK-4807: tests for NetUtils 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-03-03 21:21:52 +01:00
Marcus Sorensen def4a5ef5a LibvirtComputingResource: Support 'Oracle Linux 7' as pv guest 
Change-Id: I0b720de1b86b09ceb4ae19b3edcdcac7c557da18
 2015-03-03 10:46:38 -08:00
Marcus Sorensen 57cd7f3db5 LibvirtComputingResource: Support 'Oracle Linux 7' as pv guest 
Change-Id: Ib3fd2fec7434564e937ac5b6b3cfee472a5fdc98
 2015-03-03 10:44:12 -08:00
Rajani Karuturi b16520bcec volume upload: added max size check for temaplte/volume post upload 
used the existing configuration variables max.template.iso.size and
storage.max.volume.upload.size for templates and volumes respectively.
 2015-03-03 17:27:40 +05:30
Sanjay Tripathi 736c7d7668 CLOUDSTACK-8296 VMs cannot be migrated with XenMotion as network is not available. 2015-03-03 13:14:04 +05:30
Abhinandan Prateek 58c5850bee CLOUDSTACK-8265: added foreign key constriant on guest os id 2015-03-03 02:25:09 -05:00
Abhinandan Prateek 79cdcf8d7d CLOUDSTACK-8265: added foreign key constriant on guest os id 2015-03-03 01:45:48 -05:00
Rohit Yadav ef99f01e59 Merge remote-tracking branch 'anshul/CLOUDSTACK-6900' 
This closes #68

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-02 16:40:44 +05:30
Rohit Yadav 085554d81d Merge remote-tracking branch 'laszlo/CLOUDSTACK-8292' 
This closes #91

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-02 16:37:20 +05:30
Rohit Yadav db443c1734 Merge remote-tracking branch 'laszlo/CLOUDSTACK-8294' 
This closes #92

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-02 16:36:39 +05:30
Rohit Yadav 541c23ed07 Merge remote-tracking branch 'laszlo/CLOUDSTACK-8279' 
This closes #90

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-02 16:35:36 +05:30
Rohit Yadav 62e179b16d Merge remote-tracking branch 'exoscale/fix/python-support' 
This closes #89

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-02 16:31:23 +05:30
Laszlo Hornyak a0eb144987 packaging: date fix 
rpmbuild complained about the date "Fri Oct 03 2012"
according to the calendar, Oct 3 2012 was Wednesday

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-03-02 02:08:17 +01:00
Laszlo Hornyak 873649eb3b CLOUDSTACK-8294: fix for java 1.8 build 
The test testFindSecurityProfileByUuid built an assumptio on the order of the arguments after transforming through a HashMap.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-03-01 13:20:51 +01:00
Laszlo Hornyak 0fda5a03a4 CLOUDSTACK-8292: fix for java 1.8 compilation 
Refactored to use the XPatch expressions to check the generated domain xml rathern than string comparison.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-28 20:11:46 +01:00
Rohit Yadav ed099c3f96 server: check and set sercure cookie flag only after login 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0f819f1583)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 18:23:05 +05:30
Rohit Yadav 0f819f1583 server: check and set sercure cookie flag only after login 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 18:20:56 +05:30
Rohit Yadav 20bcb4b673 CLOUDSTACK-7063, CLOUDSTACK-7064: Add security headers on HTTP response 
- Adds X-XSS-Protection header
- Adds X-Content-Type-Options header
- Fixes to use json content type defined from global settings
- Uses secure cookie if enabled in global settings

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b6b3494782)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 18:14:49 +05:30
Rohit Yadav b6b3494782 CLOUDSTACK-7063, CLOUDSTACK-7064: Add security headers on HTTP response 
- Adds X-XSS-Protection header
- Adds X-Content-Type-Options header
- Fixes to use json content type defined from global settings
- Uses secure cookie if enabled in global settings

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 18:12:37 +05:30
Rohit Yadav 843c0f891b scripts: use cloudmanagementserver.keystore instead of cloud.keystore 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f70afa1375)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 17:06:27 +05:30
Rohit Yadav f70afa1375 scripts: use cloudmanagementserver.keystore instead of cloud.keystore 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 17:05:29 +05:30
Daan Hoogland a831beb982 Merge branch 'master' of https://github.com/ghxandsky/cloudstack 2015-02-28 00:03:33 +01:00
Rohit Yadav 694a694860 pbkdf2: fix encoding issue when converting byte[] to String 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 814e5574dc)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 00:44:20 +05:30
Rohit Yadav 814e5574dc pbkdf2: fix encoding issue when converting byte[] to String 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 00:42:27 +05:30
Laszlo Hornyak df11bb2811 CLOUDSTACK-8279: Fix unit test for java 1.8 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-27 20:06:27 +01:00
Laszlo Hornyak f8c003d13a CLOUDSTACK-8279: test fix for java 1.8 
The test build on an assumption on the order of items in a Set, while this changed in java 1.8

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-27 19:38:12 +01:00
Laszlo Hornyak e6e3a20bd6 removed redundant autoboxing 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-27 19:38:12 +01:00
Laszlo Hornyak 5626a340dd Logical expression simplification, == true is redundant 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-27 19:38:12 +01:00
Rohit Yadav 3786aa0e67 server: fix unit test to fix build 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit dd5fb2ebd6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 19:19:09 +05:30
Rohit Yadav dd5fb2ebd6 server: fix unit test to fix build 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 19:18:18 +05:30
Rohit Yadav 43cf1da865 CLOUDSTACK-5238: password checks, NPE fixes and minor fixes 
- insecure authenticators excluded in configuration
- snapshot response should have zone
- remove vmsnapshots when removing accounts

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 5481485a08)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/storage/download/DownloadActiveState.java
 2015-02-27 18:24:46 +05:30
Rohit Yadav 5481485a08 CLOUDSTACK-5238: password checks, NPE fixes and minor fixes 
- insecure authenticators excluded in configuration
- snapshot response should have zone
- remove vmsnapshots when removing accounts

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 18:20:10 +05:30
Rajani Karuturi dd1a8da977 volume upload: Volume entry created in DB even though GetUpload* API fails with "No ssvm present" error 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2015-02-27 17:42:32 +05:30
ramamurtis da1d8f9dce volume upload: fixed the UI after the change to move params to header. 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2015-02-27 17:40:06 +05:30
Rohit Yadav 8829a0d4a7 plugins: fix version to fix build 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 16:20:27 +05:30
Rohit Yadav a75ff23131 CLOUDSTACK-8273: fix baremetal account creation 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e000646790)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 2015-02-27 15:55:09 +05:30
Rohit Yadav 6f4db0ce4b CLOUDSTACK-5237: Add a default PBKDF2-SHA-256 based authenticator 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9533c54db6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 15:53:58 +05:30
Rohit Yadav e000646790 CLOUDSTACK-8273: fix baremetal account creation 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 15:52:25 +05:30
Rohit Yadav 9533c54db6 CLOUDSTACK-5237: Add a default PBKDF2-SHA-256 based authenticator 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 15:50:09 +05:30
Pierre-Yves Ritschard d5e3d4911d Support all pythons from 2.6 up. 2015-02-27 09:27:52 +01:00
ghxandsky eaf734915f Fix cloud.spec for building management rpm, need not create agent dir but agetn rpm (kvm host agent) 2015-02-26 23:51:43 +08:00
ghxandsky b6d9163ae2 Add distribution fedora21 in packaging/package.sh 2015-02-26 22:54:04 +08:00
Rohit Yadav d8e1bf1506 CLOUDSTACK-7089: don't log VNC password 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e287de9fd9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-26 18:11:12 +05:30
Rohit Yadav e287de9fd9 CLOUDSTACK-7089: don't log VNC password 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-26 18:10:23 +05:30
Rohit Yadav 4dde4106c0 server: Add missing import, fixes build 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-26 17:49:55 +05:30
Rohit Yadav 6df2fe7a8a CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit cb08707add)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
 2015-02-26 17:47:01 +05:30
Rohit Yadav cb08707add CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-26 17:42:21 +05:30
Gaurav Aradhye f393199325 CLOUDSTACK-8277: Code improvement - test_shared_networks.py, test_multiple_ip_ranges.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-26 13:05:45 +05:30
Gaurav Aradhye 429abe2bd5 CLOUDSTACK-8276: Changes in Marvin to find free vlan in a setup when vlan is not returned for an existing network with listNetworks API 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-26 13:04:20 +05:30
Rohit Yadav e1827fc696 CLOUDSTACK-8285: check and update IP capacity states based on allocation state 
- Backend should update if state was diabled and now has changed
- UI's fetch latest does not actually fetch latest

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 985a61652e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-25 16:47:40 +05:30