Commit Graph

24577 Commits

Author SHA1 Message Date
David Nalley ffe846673c more revert cleanup 2014-10-12 23:31:17 -04:00
David Nalley ac48aa8e0c cleaning up some from a revert 2014-10-12 23:30:04 -04:00
David Nalley 3cac7f01bb Revert "CLOUDSTACK-6278"
This reverts commit bc2ec23d09.
2014-10-12 23:19:30 -04:00
Hugo Trippaers e327716b89 Merge branch 'bugfix/CID-1114601' 2014-09-19 15:15:33 +02:00
Hugo Trippaers 4ad2734576 CID-1114601 to 1114604 Recommended practice is to test the result of
skip and read for EOF
2014-09-19 14:29:01 +02:00
Hugo Trippaers 90df7cf881 CID-1116300 Prevent potential NPE 2014-09-19 11:55:17 +02:00
Hugo Trippaers 6f54d48772 CID-1116298 path can be null, make sure that is properly handled 2014-09-19 11:54:21 +02:00
Hugo Trippaers 6687727b76 Frank forgot the license header 2014-09-19 10:14:38 +02:00
Hugo Trippaers d7f5a2705e Merge branch 'bugfix/CID-1191682' 2014-09-19 08:29:22 +02:00
Hugo Trippaers cf4ff03c90 CID-1191682 Fix missing break statement 2014-09-19 08:28:42 +02:00
Mike Tutkowski 18e5aa116e Fixing an issue around VMware system templates 2014-09-18 19:38:59 -06:00
Sangeetha Hariharan 7537c33bcd CLOUDSTACK-7585 -Automation - Fix test_acl_sharednetwork.py and test_acl_sharednetwork_deployVM-impersonation.py to pick 'Shared Network' network offering when creating networks 2014-09-18 19:53:28 -07:00
Frank Zhang b11e3bc60a CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
Frank Zhang bc2ec23d09 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
Frank Zhang 8b89494a35 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
rayeesn d315a5e2c9 CLOUDSTACK-7522 : Update package.sh to exit rpm with return 1, if there are failure in build 2014-09-18 16:01:53 -07:00
Hugo Trippaers 8a13f44b44 Remove duplicate field in constructor 2014-09-18 16:02:26 +02:00
Hugo Trippaers d1d8009c68 Fix a stupid bug i introduced 2014-09-18 16:02:26 +02:00
Koushik Das 4e07dd1dc4 CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls
Fix is to fail API calls with empty 'id' parameter value upfront rather than going ahead and failing with NPE later on
2014-09-18 17:10:25 +05:30
Daan Hoogland 7f440854f7 CLOUDSTACK-7184 retry-wait loop config to deal with network glitches
(cherry picked from commit a29f954a26)

Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
2014-09-18 12:55:05 +02:00
Daan Hoogland 6e1e56d399 CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger
(cherry picked from commit d04f59a30d)
2014-09-18 12:51:42 +02:00
Daan Hoogland dec9133dcd CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval
(cherry picked from commit 4d065b9a3a)

Conflicts:
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/resource/DiscovererBase.java
2014-09-18 12:51:10 +02:00
Rohit Yadav 2cd99e3e72 CID-1116245: Lock for getting answers from SynchronousListener
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:56:29 +02:00
Rohit Yadav 3640c61207 CID-1116248: Synchornize method in SynchronousListener
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:54:31 +02:00
Rohit Yadav bd1752811c CID-1116250: Lock on s_appContextDelegates before calling get in ComponentContext
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:52:18 +02:00
Rohit Yadav b1d0df16cf CID-1116258: Guard _storagePools using synchronized in KVMStoragePoolManager
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:48:11 +02:00
Rohit Yadav bfa36c0280 CID-1233090, CID-1233089: Synchronize on session object in ApiServer
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:26:20 +02:00
Rohit Yadav ec134cf010 CID-1116231: Use implicit lock, synchronize _key in Link
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:21:57 +02:00
Gaurav Aradhye 032bce5b54 CLOUDSTACK-7565: Fixes to avoiding QEMU issue in attach volume operation by changing test case steps
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-09-18 12:01:02 +05:30
Anthony Xu 071004e3e1 removed start/stop VR from queue 2014-09-17 19:04:34 -07:00
Anthony Xu 674af6e473 added hypervisor capacity for XS 6.5.0 2014-09-17 18:15:41 -07:00
Anthony Xu e5a91e40dd in tagCommand, AsyncJobExecutionContext doesn't need to be created if it doesn't exist 2014-09-17 18:15:41 -07:00
Chandan Purushothama f1f61e13e5 CLOUDSTACK-7573 : Fixed the Guest OS Type used for the ISO 2014-09-17 18:21:32 -07:00
vetrivelc 6a11d099cf Fix Externalization of hard-coded label strings
-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and
'dictionary2.jsp' -- this is due to JSP file constraints as the
localization object is getting quite long

-Per change above, 'dictionary' object is now split into an additonal
'dictionary2' object, which is merged with the main dict object on page
load

-All new dictionary mappings should be added to 'dictionary2' now.

Signed-off-by: Brian Federle <brian.federle@citrix.com>
2014-09-17 13:59:13 -07:00
Brian Federle c661289941 Fix session expire handling
If session has expired, hide entire UI (except for dialog) to prevent
clicking/seeing expired UI elements.
2014-09-17 13:31:39 -07:00
Sangeetha Hariharan d08adef264 CLOUDSTACK-7567 - Automate ACL test cases relating to depoying VM in shared network with different scopes - All/Domain/Domain with subdomain/Account for Admin, domain admin and regular users. 2014-09-17 13:45:37 -07:00
Bharat Kumar 29911dd2e1 CLOUDSTACK-7376 passwd_server attempts to start but terminates with the exit code 137
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-09-17 09:28:44 -07:00
Rohit Yadav 190bd38026 server: remove unused imports that failed build in last run
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:53:32 +02:00
Rohit Yadav e1842a9d53 CID-1199715: Remove dead code from LibvirtStorageAdaptor
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:30:42 +02:00
Rohit Yadav 369b5b439b CID-1192812: Remove dead code from DataCenterJoinDaoImpl
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:29:03 +02:00
Rohit Yadav bfd8af0751 CID-1192811: Remove dead local store from VolumeJoinDaoImpl
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:27:41 +02:00
Rohit Yadav b1929e366d CID-1192805: Remove dead local store from OvsNetworkTopologyGuruImpl
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:26:33 +02:00
Rohit Yadav c27dd6293e CID-1233085: Fix potential NPE in AccountManagerImpl from VpcManagerImpl
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 15:56:03 +02:00
Rohit Yadav 33a6640c04 README: add travis and coverity badges
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 15:36:25 +02:00
Sebastien Goasguen ab5987726c Cleaning the README, INSTALL and CHANGES file
(cherry picked from commit 528ac4c6e9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	INSTALL.md
2014-09-17 15:12:37 +02:00
Kishan Kavala 983a3b80e2 CLOUDSTACK-7568, CLOUDSTACK-7569: Use systemctl for managing services in RHEL7. chkconfig --del doesn't work in RHEL7. 2014-09-17 17:55:07 +05:30
Hugo Trippaers 577a2f40b3 Merge branch 'bugfix/CID-116538' 2014-09-17 11:40:55 +02:00
Hugo Trippaers e1973a2b70 Fix CID-1116645 2014-09-17 11:40:40 +02:00
Hugo Trippaers 086b8c0c4a Fix resource leak CID-1116654 2014-09-17 11:40:40 +02:00
Gaurav Aradhye 71611da17f CLOUDSTACK-7547: Brocade Device Data was hard coded, moved it to config file
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-09-17 14:40:30 +05:30