apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,186 Commits 308 Branches 324 Tags
Commit Graph

26186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 0f819f1583116d93ca3ebf460b69cd74144a25b2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 18:23:05 +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 b6b3494782d8bc1033941b802380ba1d5ebd464c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 18:14:49 +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 f70afa1375dd353a68c3ee9be941a605025cfc04)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 17:06:27 +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 814e5574dcabbbf52b878d9fd448be7a66118597)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 00:44:20 +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 dd5fb2ebd6904026e2ba0b3efcb6c382f860ffdd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 19:19:09 +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 5481485a083957ff58da3b6fea9d7b6d20f06875)
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
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 e000646790597cb6c245311f57761b41d23a4e34)
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 9533c54db669b22b268fcc21766e21c231e48d84)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 15:53:58 +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 e287de9fd90a06ee7f86d31ba69a84481f0820f1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-26 18:11:12 +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 cb08707addbffa12abc50aec9ad980059f23910c)
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
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 985a61652eb5dc97503c002e9fc3c3a7ca39b70c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-25 16:47:40 +05:30
Daan Hoogland
cc9461bdb8 Merge branch 'patch-1' of https://github.com/NuxRo/cloudstack 2015-02-25 11:35:16 +01:00
NuxRo
f06dc56e6a Update messages.properties 2015-02-25 10:31:57 +00:00
Daan Hoogland
76010d8871 Merge branch 'CLOUDSTACK-8210_2' of https://github.com/K0zka/cloudstack 2015-02-25 10:22:28 +01:00
Rohit Yadav
4f9bc70b1f CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b462a56f27b21455b70415ea03663af5cd62647e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-25 14:30:13 +05:30
Abhinandan Prateek
6caee8590a CLOUDSTACK-8265: added os mappings for Ubuntu 14.04 2015-02-24 07:30:54 -05:00
Marcus Sorensen
77d11eb1a3 LibvirtComputingResource: Fix coverity scan, recent bugfixes revealed a potential unhandled null in getResizeScriptType 
Change-Id: I5715a4424646261f2c43cd5e0a16fd72dd12c753
 2015-02-23 16:56:19 -08:00
NuxRo
81378c49de Update messages.properties 
Instances ca be scaled up or down, no only up.
 2015-02-23 16:01:42 +00:00
Rohit Yadav
09e26c826f db: use explicit USE statements to avoid SQL failures 
create-schema-premium.sql may fail with certain MySQL/MariaDB version which
require explicit database use.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-23 02:00:18 +05:30
Laszlo Hornyak
a9912a00b8 packaging for fedora 21 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-21 22:44:40 +01:00
Laszlo Hornyak
7319f25cf7 added net-tools to the dependencies of the agent on fedora 20 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-21 18:41:52 +01:00
Laszlo Hornyak
7340748b5c CLOUDSTACK-8163: added fedora 20 to the help text of the package script 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-21 18:41:52 +01:00
Laszlo Hornyak
b66bf97425 CLOUDSTACK-8163: initial version of packaging for fedora 20 based on centos 7 packaging 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-02-21 18:41:51 +01:00
Daan Hoogland
245c32538b Merge branch 'hotfix/scp-exception' of https://github.com/DaanHoogland/cloudstack 2015-02-21 14:06:16 +01:00
Daan Hoogland
b3281eef15 Merge branch 'master' of https://github.com/DaanHoogland/cloudstack 2015-02-21 13:12:18 +01:00
Daan Hoogland
e13d45e2c6 catch specific exception and log clear message on error 2015-02-21 12:32:29 +01:00
Daan Hoogland
0e31366a3d Merge branch 'hotfix/singlerun-test-breakage' of https://github.com/DaanHoogland/cloudstack 2015-02-20 16:10:59 +01:00
Gaurav Aradhye
53bae00801 CLOUDSTACK-8269: Code changes in primary storage test cases as per recent change in product behavior 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-20 20:03:45 +05:30
Ashutosh K
0440960933 CLOUDSTACK-7594: Adding automation test cases for stopped VM test path 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-20 20:02:08 +05:30
Gaurav Aradhye
ba08229ff9 CLOUDSTACK-8264: Code improvement - test_stopped_vm.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-20 19:59:37 +05:30