You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/25 20:05:16 UTC
[20/20] git commit: updated refs/heads/4.3 to 67df5b9
CHANGES: updates changes files, fix cherry-picked commits that break semantics
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67df5b9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67df5b9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67df5b9d
Branch: refs/heads/4.3
Commit: 67df5b9dadfb7f524576edfe001b558b9123f5a0
Parents: df6172f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 26 00:34:14 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 26 00:34:14 2014 +0530
----------------------------------------------------------------------
CHANGES.md | 19 ++++++++++++++++++-
.../kvm/storage/LibvirtStorageAdaptor.java | 3 +--
server/src/com/cloud/api/ApiDBUtils.java | 2 +-
.../com/cloud/network/NetworkServiceImpl.java | 2 +-
4 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index b501195..1399abc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -66,8 +66,25 @@ This is a bug fix release. The following issues were fixed:
CLOUDSTACK-7319: dd with direct io is less impacting on Dom0 kernel resources
CLOUDSTACK-7302: UI: Remove Hover Interaction from breadcrumbs at top page
CLOUDSTACK-7293: UI: Fixed localization issues on the login page
- CLOUDSTACK-7191:On restartNetwork destroy the VR immediatley, instead of cleanup the rules then destroy
+ CLOUDSTACK-7191: On restartNetwork destroy the VR immediatley, instead of cleanup the rules then destroy
CLOUDSTACK-7144: No GSLB provider is available during assigning load balancing rule
+ CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared networks
+ CLOUDSTACK-6996: Adding cluster to legacy zone failed
+ CLOUDSTACK-6989: Add 3 strikes rule for RvR freezing detection
+ CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary
+ CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance
+ CLOUDSTACK-6783: Return a proper LibvirtStoragePool object after creating the pool
+ CLOUDSTACK-6714: monitor script echo service command is added with quotes
+ CLOUDSTACK-6578: Fixed issue in delete remote access vpn command
+ CLOUDSTACK-6577: Disable service monitoring in RVR
+ CLOUDSTACK-6516: In 4.3, SSL was turned off by default.
+ CLOUDSTACK-6467: Add pre/post-state transition status to messages published on
+ CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting
+ CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
+ CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails
+ CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus
+ CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones
+ CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name".
Version 4.3.1
-------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 2925b6f..768073e 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -545,8 +545,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
pool.setLocalPath("");
}
- if (pool.getType() == StoragePoolType.RBD
- || pool.getType() == StoragePoolType.Gluster) {
+ if (pool.getType() == StoragePoolType.RBD) {
pool.setSourceHost(spd.getSourceHost());
pool.setSourcePort(spd.getSourcePort());
pool.setSourceDir(spd.getSourceDir());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 1df872e..54db329 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -980,7 +980,7 @@ public class ApiDBUtils {
// quite clear what to do if both storage types are used. If the image
// format is RAW, it narrows the hypervisor choice down to OVM and KVM / RBD or KVM / CLVM
// This would be better implemented at a cluster level.
- List<StoragePoolVO> pools = s_storagePoolDao.listByDataCenterId(dcId);
+ List<StoragePoolVO> pools = _storagePoolDao.listByDataCenterId(dcId);
ListIterator<StoragePoolVO> itr = pools.listIterator();
while(itr.hasNext()) {
StoragePoolVO pool = itr.next();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index d3f3946..767d2b1 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1798,7 +1798,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
Account owner = _accountMgr.getAccount(network.getAccountId());
// Only Admin can delete Shared networks
- if (network.getGuestType() == GuestType.Shared && !_accountMgr.isAdmin(caller.getId())) {
+ if (network.getGuestType() == GuestType.Shared && !_accountMgr.isAdmin(caller.getType())) {
throw new InvalidParameterValueException("Only Admins can delete network with guest type " + GuestType.Shared);
}