Commit Graph

20355 Commits

Author SHA1 Message Date
Brian Federle 96cee01f70 Add missing license header 2013-05-15 11:58:40 -07:00
Prachi Damle 73030f4372 CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Changing the correct details dao. Instead of using separate delete and insert, we will use ON DUPLICATE KEY UPDATE to avoid the MySQL deadlock
2013-05-15 11:58:13 -07:00
Brian Federle 08bc6bf778 Fix 'protocolnumber' change event 2013-05-15 11:57:14 -07:00
Prachi Damle d31217f3be CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Added the index found missing after upgrade

Contained in branches: master
Contained in no tag
2013-05-15 11:16:43 -07:00
Prachi Damle a13dd59d16 CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Instead of using separate delete and insert, we will use ON DUPLICATE KEY UPDATE to avoid the MySQL deadlock
2013-05-15 11:16:41 -07:00
Jessica Wang 7e0006a3e5 CLOUDSTACK-747: internalLb in VPC - UI - create tier dialog - only one tier is allowed to have PublicLb in a VPC. 2013-05-15 11:03:51 -07:00
Alena Prokharchyk dbb223e4de Fixed applyLbRules for Netscaler. 2013-05-15 10:32:32 -07:00
Brian Federle 59a99848b1 Merge branch 'master' into ui-vpc-redesign
Conflicts:
	ui/scripts/vpc.js
2013-05-15 10:18:55 -07:00
Marcus Sorensen bfc5887a1b Summary: Use hypervisor as clock source for system vms
BUG-ID: CLOUDSTACK-2492
Bugfix-for: 4.1,master
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1368635782 -0600
2013-05-15 10:36:22 -06:00
Wei Zhou 8f7a51ee5f CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
https://reviews.apache.org/r/11157/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-15 16:39:22 +01:00
Joe Mills 987c3427dd Midonet Plugin bugfixes
* Updated SQL upgrade scripts to include midonet configs.
* Fixed bug where default ICMP allow rule was missing
  on static NAT creation, keeping VMs from being able
  to ping the gateway.
* Changed the filter in the MidoNetElement callbacks to allow
  calls when Midonet is configured.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-05-15 17:06:00 +02:00
Jayapal 36a312d4b2 CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip 2013-05-15 18:08:15 +05:30
Likitha Shetty f893aa8a78 CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 18:05:01 +05:30
Pranav Saxena 6d6887533f CLOUDSTACK-2491:NTier: Creation of ACL Rule for protocol AH (51) and ESP (50) Fails 2013-05-15 18:01:10 +05:30
Wido den Hollander 68a428f84d CLOUDSTACK-2515: Verify if the targetPath isn't null before comparing 2013-05-15 13:57:58 +02:00
Jayapal 9b6513466f CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 16:45:52 +05:30
Wei Zhou 7370638915 CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl 2013-05-15 16:45:52 +05:30
Harikrishna Patnala ffe90c0059 CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh

Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.

Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
2013-05-15 16:17:21 +05:30
Sanjay Tripathi 9542f10592 CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 15:28:37 +05:30
Prasanna Santhanam b17be94cf5 don't let requests logs
requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-15 14:52:33 +05:30
Nitin Mehta 24cdddbf5e CLOUDSTACK-2459 Fix the scale vm tests 2013-05-15 14:25:39 +05:30
Kishan Kavala 39caa0ebdd Updated network acl service test to avoid default ACL modification 2013-05-15 14:20:29 +05:30
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Kishan Kavala 3388b77156 CLOUDSTACK-2487: Show error while adding acl_item to default ACL 2013-05-15 12:51:08 +05:30
Edison Su ed065418b6 add license header 2013-05-14 21:58:07 -07:00
Edison Su 879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Min Chen c6a5a7ee00 Fix CLOUDSTACK-2495: public templates are not visible to non-root users. 2013-05-14 21:52:29 -07:00
radhikap be9850161e CLOUDSTACK-2467 and CLOUDSTACK-2466 2013-05-15 09:18:57 +05:30
Koushik Das f484f4af09 CLOUDSTACK-2475: Failed to create PF rules with Cisco VNMC as the port pool object name is exceeding the max limit
Ip and port pool object names in VNMC were created by appending guest vlan, public ip and id of corresponding rule for better readability. This resulted in the name exceeding max. length allowed.
Shortened the name by removing public ip part from it.
2013-05-15 09:12:48 +05:30
Anthony Xu 1518e7ee43 CLOUDSTACK-2115: remove the trailing '\n' to get correct XS network mode 2013-05-14 17:52:10 -07:00
Edison Su 68ffe1c706 fix bug in create volume from snapshot 2013-05-14 16:38:02 -07:00
Brian Federle cb31791adf WIP ACL draggable multi-edit 2013-05-14 16:25:37 -07:00
Min Chen 564d3d6fa0 Fix CLOUDSTACK-2488: Delete iso async job is running forever. 2013-05-14 16:12:49 -07:00
Alena Prokharchyk 26cefdcfac When UUID field is null for existing records, set it to id
Conflicts:
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2013-05-14 15:11:41 -07:00
Min Chen 252f384e89 Fix CLOUDSTACK-2485: ClassCastException in extracting ISO. 2013-05-14 14:57:02 -07:00
Min Chen 95e7e270d4 Fix the hanging issue in deleting ISO referenced by some user vms. 2013-05-14 14:57:02 -07:00
Min Chen 03c255068b Fix CLOUDSTACK-2484: not able to deploy VM from registered ISO. 2013-05-14 14:57:02 -07:00
Min Chen 87af4ddab0 Only download eligible system template for S3 image store. 2013-05-14 14:57:01 -07:00
Brian Federle 1c2ee35345 Merge branch 'master' into ui-vpc-redesign 2013-05-14 13:55:09 -07:00
Edison Su 12583bbffc snapshot path is accountId + volumeid 2013-05-14 13:20:10 -07:00
Pranav Saxena edb2f3da26 CLOUDSTACK-768:ACLs on Private GATEWAY :Acl id on Private Gateway ListView 2013-05-15 00:22:26 +05:30
Min Chen 2102ede2e7 Fix CLOUDSTACK-2469: default template is not downloaded. 2013-05-14 11:42:24 -07:00
Alena Prokharchyk eff7587d51 InternalLB: allow domain admin to stop/start internal lb vms 2013-05-14 10:38:17 -07:00
Pranav Saxena 10380cea41 CLOUDSTACK-768:ACLs on Private GATEWAY 2013-05-14 22:47:53 +05:30
Wido den Hollander b5bb9f251c debian: Change the version in the changelog 2013-05-14 15:56:36 +02:00
Srikanteswararao Talluri 237397df3c CLOUDSTACK-2382: fix the validation part in the test_global_settings 2013-05-14 17:31:21 +05:30
Jayapal 46f8b6f34a CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway 2013-05-14 16:11:33 +05:30
Jayapal c94c71b4ce CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways 2013-05-14 16:10:38 +05:30
sanjeevneelarapu 7d380423b5 CLOUDSTACK-702: Tests for Multiple IP Ranges
1. Add ip range super set to existing CIDR
2. Add ip range subset to existing CIDR

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 15:52:54 +05:30
Hugo Trippaers 37ca43684b CLOUDSTACK-2440 Print a warning if the rpm can't determine the previous configuration for server.xml or tomcat.conf 2013-05-14 11:05:04 +02:00