etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,412 Commits 322 Branches 325 Tags 975 MiB
Commit Graph

23412 Commits

Author SHA1 Message Date
Jessica Wang 20c581e632 BUG-ID: CS-19795: UI > Add LDAP Account - fix a bug that a LDAP account that does not have email and all LDAP accounts below it are missing from the listing. 
Reviewed-by: Brian

(cherry picked from commit 953167808c)
 2014-07-28 13:59:52 +02:00
Koushik Das 25b4159723 CLOUDSTACK-6445: Simulator enhancements 
Refer FS - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simulator+enhancements

(cherry picked from commit 617826d16b)
 2014-07-28 13:58:55 +02:00
Daan Hoogland 19eb06bd3e version to 4.4.1 on remaining modules 2014-07-26 20:35:31 +02:00
Daan Hoogland 3dae39fb00 checkstyle version 2014-07-26 07:05:53 +02:00
Daan Hoogland c9383c441e Updating pom.xml version numbers for release 4.4.1-SNAPSHOT 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-07-23 16:55:31 +02:00
Frank.Zhang 5ee7bf1be0 Revert "fix iptables chain name too long (must be under 30 chars)" 
This reverts commit 88f866645b.
 2014-07-21 17:27:45 -07:00
Frank.Zhang 5ad2b4feda fix iptables chain name too long (must be under 30 chars) 2014-07-18 17:30:18 -07:00
Daan Hoogland 72a62403de bogus db changes from previous conflict resolution 2014-07-18 05:49:13 +02:00
amoghvk a72991a313 CLOUDSTACK-6358: KVM mappings for CentOS 6.x and RHEL 6.x 
(cherry picked from commit c8ca15b95a)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-17 23:40:49 +02:00
Alena Prokharchyk 92d1428c48 CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states 
(cherry picked from commit 822b38761f)
 2014-07-17 09:49:29 +02:00
Daan Hoogland 58a4c7a891 xapi release version dep 2014-07-16 13:48:52 +02:00
Anthony Xu 7fe353d499 CLOUDSTACK-6662 
CLOUDSTACK-6844

 exit status delivery might get delayed

 Please enter the commit message for your changes. Lines starting

(cherry picked from commit 2ec7359b4e)
 2014-07-16 13:38:15 +02:00
Jayapal 7703b2fab3 CLOUDSTACK-7092: Disabled icmp redirects in VR 
(cherry picked from commit e0d4af5062)
 2014-07-15 22:13:32 +02:00
Prachi Damle 29b09b1e21 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account 
Changes:
- removing unused imports

Conflicts:
	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java

(cherry picked from commit f37b152489)
 2014-07-03 16:13:15 +02:00
Prachi Damle b70bd23be3 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account 
Changes:
-DeploymentPlanner should include disabled resources only when the VM owner is Admin account. The disabled resources should be ignored when VM is owned by any other user.

(cherry picked from commit 40e28de727)
 2014-07-03 16:13:05 +02:00
Daan Hoogland 332836746d add checkstyle to version upgrade 2014-07-01 21:58:47 +02:00
Jayapal 09022344ee CLOUDSTACK-7027: Removing left over static nat rule 
(cherry picked from commit a69c1ee31d)
 2014-07-01 14:36:33 +02:00
Jayapal d5a92454fd CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over 
(cherry picked from commit e336796cd5)
 2014-07-01 14:36:27 +02:00
Mike Tutkowski 9d7a832395 Fixing an i18n issue related to label.cache.mode 
(cherry picked from commit 76930f6eab)
 2014-07-01 14:03:29 +02:00
Jayapal d4a903fd6e CLOUDSTACK-6997: Increase proc ip_conntrack_max 
(cherry picked from commit 004d616322)
 2014-06-30 19:52:42 +02:00
Daan Hoogland 3142bb7f3a edit checkstyle pom on rc creation 2014-06-30 17:53:17 +02:00
Ian Duffy 6aef8bd906 CLOUDSTACK-7005 - Failed to start MS with latest 4.4 RPM builds 
(cherry picked from commit f7417d622a)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-06-29 21:48:07 +02:00
Sheng Yang 8db1b21cc8 CLOUDSTACK-3540: Fix edithosts.sh on matching tag 
(cherry picked from commit 46f2b61374)
 2014-06-29 11:15:04 +02:00
Daan Hoogland 80f2694443 Revert "CLOUDSTACK-6935 refactor StoragePoolAllocator#filter logic" 
This reverts commit 99dd86e588.
 2014-06-27 17:45:35 +02:00
Sateesh Chodapuneedi a1a23d2f03 CLOUDSTACK-6996 Adding cluster to legacy zone failed 
Lookup zone_id field in legacy_zones table to search the table for legacy zone.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

(cherry picked from commit 75aa243d1e)
 2014-06-27 13:04:37 +02:00
Sanjay Tripathi 8f9458e517 CLOUDSTACK-6884: List Capacity API always returns GPU capacity also even if type is different. 
(cherry picked from commit 48646ae186)
 2014-06-27 09:41:52 +02:00
Sanjay Tripathi e0d7eb8fc0 CLOUDSTACK-6453: [GPU] Windows 2012 Server instance created with vGPU offering is not coming up after installing PV drivers. 
(cherry picked from commit dc22566c64)
 2014-06-27 09:30:06 +02:00
Mike Tutkowski 1dbcf8f458 Submitted on behalf of Vetri for Review Request 23008 
(cherry picked from commit 9c2e6f5ed4)
 2014-06-26 19:16:43 +02:00
Ian Duffy 0296c46f09 remove unused import 
(cherry picked from commit 2bb12f2a85)
 2014-06-25 21:33:08 +02:00
Ian Duffy c70cadff0e Allow for length of password on VMs to be set via global settings 
(cherry picked from commit 96412e3e58)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-06-25 21:22:06 +02:00
Daan Hoogland 86aff86b78 CLOUDSTACK-6747: call a more forgiving test on the supplied peer 
cidr-list
(cherry picked from commit 17850c7aff)
 2014-06-25 17:18:45 +02:00
Daan Hoogland 8cb2a87815 CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc 
(cherry picked from commit 3268f5bd1f)
 2014-06-25 17:18:07 +02:00
Daan Hoogland ce69bd707d CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or 
private
(cherry picked from commit 018b471ad3)
 2014-06-25 17:17:39 +02:00
Damodar Reddy 3cdcf77933 CLOUDSTACK-6444: Fixing the issue with iSCSI path Format /targetIQN/LUN. 
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 24401e0b2b)
 2014-06-24 10:14:58 +02:00
Jayapal 861eff98d0 CLOUDSTACK-6923: Fixed issue in lbsticlbsticlbrule with lbrule id 
(cherry picked from commit a195e50ae7)
 2014-06-24 10:13:46 +02:00
Logan B 6b8b7b82f4 Changed logic for copying snapshot from S3 to NFS staging store to prevent needless failure. 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 736bf540e8)
 2014-06-23 20:28:04 +02:00
Sheng Yang f7dd1720cb CLOUDSTACK-6854: Fix inconsistent IPv6 address formats 
fc00:0003:1373::0002 should be treated the same as fc00:3:1373::2.
(cherry picked from commit dfe20f34f2)
 2014-06-23 20:25:43 +02:00
Min Chen 0d23ad903d CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean 
injection.

(cherry picked from commit 31e250a9d2)
 2014-06-23 20:19:36 +02:00
Anshul Gangwar af37ade9e3 CLOUDSTACK-6830: Fixed [hyper-v] during VM migration, volumes on zone wide primary 
store requires storage migration resulting in failure of VM migration. This also
improves the hostsformigration api. Firstly we were trying to list all hosts and
then finding suitable storage pools for all volumes and then we were checking
whether vm migration requires storage migration to that host. Now the process is
updated. We are checking for only those volumes which are not in zone wide primary
store. We are verifying by comparing volumes->poolid->clusterid to host clusterid.
If it uses local or clusterids are different then verifying whether host has
suitable storage pools for the volume of the vm to be migrated too.

(cherry picked from commit 64153a4371)

Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2014-06-23 09:56:17 +02:00
Anshul Gangwar 1b1a417bb4 CLOUDSTACK-6968: Allowing cluster scope volumes to attach to any VM. If migration is 
needed then first they will be migrated to appropriate cluster before attaching.

(cherry picked from commit e7ba46b5f7)
 2014-06-23 09:50:31 +02:00
Anshul Gangwar 423c23af40 CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack 
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage

(cherry picked from commit ef45f06f88)
 2014-06-23 09:50:04 +02:00
Kelven Yang c422933719 CLOUDSTACK-6970: Protect event interpretion from causing NPE exception 
(cherry picked from commit 06d8d3a03f)
 2014-06-20 22:31:56 +02:00
Murali Reddy 6bd9d1241b CLOUDSTACK-6750: [OVS] With stretched network deploying vm in a ovs 
disabled zone does not fail

Fix ensures that connectivity service provider is enabled in the zone on
to which nework is being streched.

(cherry picked from commit d8cbba1bc6)
 2014-06-19 15:24:05 +02:00
ynojima 99dd86e588 CLOUDSTACK-6935 refactor StoragePoolAllocator#filter logic 
to support IOPS capacity control in a cluster wide storage pool and a
local storage pool
to enable hypervisor type check, storage type check for root volume and
avoid list check

Since original commit(31de58edab) contained
a bug, it was reverted and this commit is a revised one.

(cherry picked from commit 45f0c73676)
 2014-06-19 09:41:47 +02:00
Jayapal 335f165b5b CLOUDSTACK-6923: updated listLBStickinessPolicies API to list using stickinesspolicy id 
(cherry picked from commit b0d726a872)

Conflicts:
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
 2014-06-18 14:12:46 +02:00
Rajesh Battala 6b9ac8be8b CLOUDSTACK-6920 Support listing of LBHealthcheck policy with LBHealthcheck policy ID 
(cherry picked from commit 21e452ff4f)

Conflicts:
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
 2014-06-18 13:21:32 +02:00
Murali Reddy 56c2a094f6 CLOUDSTACK-6925: [OVS] get rid custom logic to create bridges on hosts 
in the XenServer pool for GRE tunnel networks

Fix uses XenServer recommended way
Network.other_config:assume_network_is_shared=true
which ensures bridge is created automatically on hosts in the pool for
GRE tunnel networks. Fix also gets rid of  error prone custom logic that ensures
bridge is created by plugging a VIF into the dom0 and connected to
GRE tunnel network.

(cherry picked from commit 8ca8a7217e)
 2014-06-17 14:34:35 +02:00
Santhosh Edukulla 61cf175f1c Coverity issues: Fixed conflicts 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-17 13:49:55 +02:00
Girish chaudhari 5cc5483a78 CLOUDSTACK-5150 - set the template size from source 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 883d8f1119)
 2014-06-17 13:49:25 +02:00
Jayapal c82b61a92f CLOUDSTACK-6922: Updated events for firewall ingress and egress 
(cherry picked from commit 2214bd2502)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-06-17 13:21:50 +02:00