You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/09/16 12:51:50 UTC

[01/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Repository: cloudstack
Updated Branches:
  refs/heads/hotfix/4.4/CLOUDSTACK-7184 b0641a7d2 -> b82f27be4 (forced update)


CLOUDSTACK-7528: More verbose logging when sending alert fails

When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).

(cherry picked from commit 91fd8d7cd5d5a83bf75f5f2972ad2eb2a4a07694)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

Conflicts:
	server/src/com/cloud/alert/AlertManagerImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4f5ea3c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4f5ea3c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4f5ea3c

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: f4f5ea3cc02d931416579514a3289a607f7c5cac
Parents: bd8eaf8
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Sep 10 11:29:30 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Sep 10 11:45:02 2014 +0200

----------------------------------------------------------------------
 server/src/com/cloud/alert/AlertManagerImpl.java     | 2 +-
 usage/src/com/cloud/usage/UsageAlertManagerImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4f5ea3c/server/src/com/cloud/alert/AlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
index 2a343d5..fc5b5fd 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -252,7 +252,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi
                 _emailAlert.sendAlert(alertType, dataCenterId, podId, null, subject, body);
             } else {
                 s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null +
-                    " // message:: " + subject);
+                    " // message:: " + subject + " // body:: " + body);
             }
         } catch (Exception ex) {
             s_logger.error("Problem sending email alert", ex);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4f5ea3c/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
index 67bb702..3c55f57 100644
--- a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
@@ -105,7 +105,7 @@ public class UsageAlertManagerImpl extends ManagerBase implements AlertManager {
                 _emailAlert.sendAlert(alertType, dataCenterId, podId, subject, body);
             } else {
                 s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null +
-                    " // message:: " + subject);
+                    " // message:: " + subject + " // body:: " + body);
             }
         } catch (Exception ex) {
             s_logger.error("Problem sending email alert", ex);


[06/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
CLOUDSTACK-7462: UI > Network > VPC > Router > Network ACL Lists > click an entry from list > Details tab > ACL List Rules tab > click Edit icon on any existing rule > fix the JavaScript error "args.jsonObj is undefined".


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa81823c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa81823c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa81823c

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: aa81823ce81540d83f3d14f3eceffa2783bfaaf5
Parents: f7d9ea2
Author: Jessica Wang <je...@apache.org>
Authored: Thu Sep 11 13:35:28 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Sep 11 13:35:28 2014 -0700

----------------------------------------------------------------------
 ui/scripts/sharedFunctions.js | 66 +++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa81823c/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index f58fdd2..1ed90c2 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -2089,42 +2089,42 @@ cloudStack.api = {
                 }
             },
             dataProvider: function(args) {
-            	args.response.success({
-                    data: args.jsonObj.tags
-                });
-            	
-            	/*
-                var resourceId = args.context[contextId][0].id;
-                var data = {
-                    resourceId: resourceId,
-                    resourceType: resourceType
-                };
-
-                if (isAdmin() || isDomainAdmin()) {
-                    data.listAll = true;
-                }
-
-                if (args.context.projects) {
-                    data.projectid = args.context.projects[0].id;
-                }
+            	if (args.jsonObj != undefined) {
+	            	args.response.success({
+	                    data: args.jsonObj.tags
+	                });
+            	} else {
+            		var resourceId = args.context[contextId][0].id;
+                    var data = {
+                        resourceId: resourceId,
+                        resourceType: resourceType
+                    };
+
+                    if (isAdmin() || isDomainAdmin()) {
+                        data.listAll = true;
+                    }
 
-                if (args.jsonObj != null && args.jsonObj.projectid != null && data.projectid == null) {
-                    data.projectid = args.jsonObj.projectid;
-                }
+                    if (args.context.projects) {
+                        data.projectid = args.context.projects[0].id;
+                    }
 
-                $.ajax({
-                    url: createURL('listTags'),
-                    data: data,
-                    success: function(json) {
-                        args.response.success({
-                            data: json.listtagsresponse ? json.listtagsresponse.tag : []
-                        });
-                    },
-                    error: function(json) {
-                        args.response.error(parseXMLHttpResponse(json));
+                    if (args.jsonObj != null && args.jsonObj.projectid != null && data.projectid == null) {
+                        data.projectid = args.jsonObj.projectid;
                     }
-                });
-                */
+
+                    $.ajax({
+                        url: createURL('listTags'),
+                        data: data,
+                        success: function(json) {
+                            args.response.success({
+                                data: json.listtagsresponse ? json.listtagsresponse.tag : []
+                            });
+                        },
+                        error: function(json) {
+                            args.response.error(parseXMLHttpResponse(json));
+                        }
+                    });
+            	}            	
             }
         };
     }


[11/15] Cleaning the README, INSTALL and CHANGES file

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
new file mode 100644
index 0000000..7f052a7
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1,784 @@
+
+Apache CloudStack CHANGES
+======================================
+
+Full release notes for each release are located in the project's documentation [website](http://docs.cloudstack.apache.org/projects/cloudstack-release-notes)
+
+Version 4.4.0
+-------------
+
+This major release has the following bug fixes:
+
+Bug ID | Description
+--- | ---
+[CLOUDSTACK-6997](https://issues.apache.org/jira/browse/CLOUDSTACK-6997) | conntrack set to a very low value on router...
+[CLOUDSTACK-6996](https://issues.apache.org/jira/browse/CLOUDSTACK-6996) | Adding cluster to legacy zone failed...
+[CLOUDSTACK-6989](https://issues.apache.org/jira/browse/CLOUDSTACK-6989) | Redunant virtual router(RvR): When time synced by ntpd, RvR may result in FAULT ...
+[CLOUDSTACK-6941](https://issues.apache.org/jira/browse/CLOUDSTACK-6941) | Can't choose storage for the volume, when attaching uploaded data volume to VM...
+[CLOUDSTACK-6925](https://issues.apache.org/jira/browse/CLOUDSTACK-6925) | [OVS] get rid custom logic to create bridges on hosts in the XenServer pool...
+[CLOUDSTACK-6908](https://issues.apache.org/jira/browse/CLOUDSTACK-6908) | ipv6 enabled by default...
+[CLOUDSTACK-6899](https://issues.apache.org/jira/browse/CLOUDSTACK-6899) | listNics doesn't have vm id in response but does take vm id as a param...
+[CLOUDSTACK-6869](https://issues.apache.org/jira/browse/CLOUDSTACK-6869) | Public key content is overridden by template's meta data when you create a insta...
+[CLOUDSTACK-6859](https://issues.apache.org/jira/browse/CLOUDSTACK-6859) | Management Server PermGen run out of memory after some time due to class leak....
+[CLOUDSTACK-6850](https://issues.apache.org/jira/browse/CLOUDSTACK-6850) | Cpu cores, cpu speed and memory are not returned by listUsageRecords...
+[CLOUDSTACK-6816](https://issues.apache.org/jira/browse/CLOUDSTACK-6816) | cloudstack-setup-management make /root directory's permission 0777  improperly...
+[CLOUDSTACK-6756](https://issues.apache.org/jira/browse/CLOUDSTACK-6756) | usage id is not being returned for an ip in deleted ip range...
+[CLOUDSTACK-6743](https://issues.apache.org/jira/browse/CLOUDSTACK-6743) | Race condition situation in MessageDetector may cause a outer tight loop to spin...
+[CLOUDSTACK-6714](https://issues.apache.org/jira/browse/CLOUDSTACK-6714) | Service monitoring conf is has issue with script in vmware...
+[CLOUDSTACK-6665](https://issues.apache.org/jira/browse/CLOUDSTACK-6665) | DHCP does not release ip addresses properly on VPC routers (edithosts.sh)...
+[CLOUDSTACK-6646](https://issues.apache.org/jira/browse/CLOUDSTACK-6646) | Conntrackd is started on non-redundant virtual router...
+[CLOUDSTACK-6578](https://issues.apache.org/jira/browse/CLOUDSTACK-6578) | DeleteRemoteAccessVpnCmd failed block enable Remote VPN access again on the IP a...
+[CLOUDSTACK-6577](https://issues.apache.org/jira/browse/CLOUDSTACK-6577) | Disable service monitoring in RVR...
+[CLOUDSTACK-6509](https://issues.apache.org/jira/browse/CLOUDSTACK-6509) | Cannot import multiple LDAP/AD users into a cloudstack account...
+[CLOUDSTACK-6478](https://issues.apache.org/jira/browse/CLOUDSTACK-6478) | Failed to download Template when having 3 SSVM's in one zone on Vmware...
+[CLOUDSTACK-6472](https://issues.apache.org/jira/browse/CLOUDSTACK-6472) | listUsageRecords generates NPEs for expunging instances...
+[CLOUDSTACK-6471](https://issues.apache.org/jira/browse/CLOUDSTACK-6471) | Add logs to better diagnose failures and errors in LDAP AD integration...
+[CLOUDSTACK-6396](https://issues.apache.org/jira/browse/CLOUDSTACK-6396) | KVM RBD Volumes shown as OVM, prevents snapshots...
+[CLOUDSTACK-6376](https://issues.apache.org/jira/browse/CLOUDSTACK-6376) | listnetworkacls api when called with a networkid of a network which was created ...
+[CLOUDSTACK-6374](https://issues.apache.org/jira/browse/CLOUDSTACK-6374) | LB rules added while router reqiuires upgrade should be removed from lb vm map...
+[CLOUDSTACK-6371](https://issues.apache.org/jira/browse/CLOUDSTACK-6371) | KVM - secondary_storage count for account does not get incremted when snapshots ...
+[CLOUDSTACK-6358](https://issues.apache.org/jira/browse/CLOUDSTACK-6358) | Remove hardcoded guest OS mappings...
+[CLOUDSTACK-6356](https://issues.apache.org/jira/browse/CLOUDSTACK-6356) | OVS: tunnel networks does not work across the XenServer clusers...
+[CLOUDSTACK-6328](https://issues.apache.org/jira/browse/CLOUDSTACK-6328) | Prevent console proxy support scripts from spawning multiple java processes...
+[CLOUDSTACK-6322](https://issues.apache.org/jira/browse/CLOUDSTACK-6322) | Contrail: Params validation is missing while launching a service instance thru c...
+[CLOUDSTACK-6319](https://issues.apache.org/jira/browse/CLOUDSTACK-6319) | Cannot create OVS network offering for VPC...
+[CLOUDSTACK-6317](https://issues.apache.org/jira/browse/CLOUDSTACK-6317) | [VMware] Tagged VLAN support broken for Management/Control/Storage traffic...
+[CLOUDSTACK-6299](https://issues.apache.org/jira/browse/CLOUDSTACK-6299) | GetVMPassword decypher instructions are wrong...
+[CLOUDSTACK-6289](https://issues.apache.org/jira/browse/CLOUDSTACK-6289) | [Hyper-V] Storage migration failing in case of hyper-v if there are multiple dis...
+[CLOUDSTACK-6288](https://issues.apache.org/jira/browse/CLOUDSTACK-6288) | [Hyper-v] Change default ImageFormat to vhdx for hyper-v and allow registration ...
+[CLOUDSTACK-6285](https://issues.apache.org/jira/browse/CLOUDSTACK-6285) | Some passwords in the VR would be cleared out by accident due to falsely match i...
+[CLOUDSTACK-6277](https://issues.apache.org/jira/browse/CLOUDSTACK-6277) | Fail to add instance, the Network and Review steps display as blank pages....
+[CLOUDSTACK-6269](https://issues.apache.org/jira/browse/CLOUDSTACK-6269) | [Simulator]: Exception "Unable to send command. Upgrade in progress. Please cont...
+[CLOUDSTACK-6245](https://issues.apache.org/jira/browse/CLOUDSTACK-6245) | Security group rules on hypervisor host are lagging behind rules in DB...
+[CLOUDSTACK-6241](https://issues.apache.org/jira/browse/CLOUDSTACK-6241) | Dnsmasq programming error when deploy IPv6 and IPv4 in one VM with IPv4 as defau...
+[CLOUDSTACK-6236](https://issues.apache.org/jira/browse/CLOUDSTACK-6236) | Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range ...
+[CLOUDSTACK-6232](https://issues.apache.org/jira/browse/CLOUDSTACK-6232) | isolated network can no longer reserve ip range...
+[CLOUDSTACK-6231](https://issues.apache.org/jira/browse/CLOUDSTACK-6231) | Cloudstack createNetworkACL cuts cidrlist at 256 characters...
+[CLOUDSTACK-6227](https://issues.apache.org/jira/browse/CLOUDSTACK-6227) | Add copy-paste support for detail view fields...
+[CLOUDSTACK-6224](https://issues.apache.org/jira/browse/CLOUDSTACK-6224) | VM Snapshot inconsistent size...
+[CLOUDSTACK-6223](https://issues.apache.org/jira/browse/CLOUDSTACK-6223) | removeNicFromVirtualMachine fails if another instance in another domain has a ni...
+[CLOUDSTACK-6211](https://issues.apache.org/jira/browse/CLOUDSTACK-6211) | Xenserver - HA - SSVM fails to start due to running out of management Ip ranges ...
+[CLOUDSTACK-6210](https://issues.apache.org/jira/browse/CLOUDSTACK-6210) | LDAP:listLdapUsers api throws exception when we click on "Add LDAP Account" ...
+[CLOUDSTACK-6196](https://issues.apache.org/jira/browse/CLOUDSTACK-6196) | Fixed invalid field name (label.dynamically.scalable) on instance details....
+[CLOUDSTACK-6192](https://issues.apache.org/jira/browse/CLOUDSTACK-6192) | KVM: StartCommand and PrepareForMigrationCommand don't fail if storage adaptor f...
+[CLOUDSTACK-6187](https://issues.apache.org/jira/browse/CLOUDSTACK-6187) | Migrate router from UI is showing error...
+[CLOUDSTACK-6183](https://issues.apache.org/jira/browse/CLOUDSTACK-6183) | Unplug the nic when all the ips of public subnet is released...
+[CLOUDSTACK-6172](https://issues.apache.org/jira/browse/CLOUDSTACK-6172) | Volume is not retaining same uuid when migrating from one storage to another....
+[CLOUDSTACK-6159](https://issues.apache.org/jira/browse/CLOUDSTACK-6159) | [Hyper-v]Attached data volumes are getting created with disk name in primary sto...
+[CLOUDSTACK-6151](https://issues.apache.org/jira/browse/CLOUDSTACK-6151) | Local data disk with tag goes to the wrong local storage pool...
+[CLOUDSTACK-6124](https://issues.apache.org/jira/browse/CLOUDSTACK-6124) | During MS maintenance unfinished work items are not cleaned up resulting in them...
+[CLOUDSTACK-6103](https://issues.apache.org/jira/browse/CLOUDSTACK-6103) | vms with isos attached don't migrate...
+[CLOUDSTACK-6062](https://issues.apache.org/jira/browse/CLOUDSTACK-6062) | nic device ids for routers don't always correspond...
+[CLOUDSTACK-6053](https://issues.apache.org/jira/browse/CLOUDSTACK-6053) | While adding smb as primary or secondary the password should be uri encoded...
+[CLOUDSTACK-6032](https://issues.apache.org/jira/browse/CLOUDSTACK-6032) | [VmScaleup]service offering id is not getting changed in usage_vm_instance table...
+[CLOUDSTACK-6024](https://issues.apache.org/jira/browse/CLOUDSTACK-6024) | template copy to primary storage uses a random source secstorage from any zone...
+[CLOUDSTACK-6011](https://issues.apache.org/jira/browse/CLOUDSTACK-6011) | NPE when detach is called on a deleted volume...
+[CLOUDSTACK-6000](https://issues.apache.org/jira/browse/CLOUDSTACK-6000) | Volume lifecycle, stuck in expunging...
+[CLOUDSTACK-5998](https://issues.apache.org/jira/browse/CLOUDSTACK-5998) | [AWSAPI] describe addresses call returns a fault with "domain cannot be null!!"...
+[CLOUDSTACK-5995](https://issues.apache.org/jira/browse/CLOUDSTACK-5995) | change service offering is not honouring host tags ...
+[CLOUDSTACK-5993](https://issues.apache.org/jira/browse/CLOUDSTACK-5993) | Cloud agent fails to start on 32-bit system vms (cpvm and ssvm) created with 4GB...
+[CLOUDSTACK-5989](https://issues.apache.org/jira/browse/CLOUDSTACK-5989) | Trying to start a vm while 'vm snapshot' is in progress results in inconsistency...
+[CLOUDSTACK-5976](https://issues.apache.org/jira/browse/CLOUDSTACK-5976) | [upgrade]Typo in "ssh_keypairs" table's foreign key constraints on the Upgraded ...
+[CLOUDSTACK-5965](https://issues.apache.org/jira/browse/CLOUDSTACK-5965) | VM displayname is not returned by API...
+[CLOUDSTACK-5962](https://issues.apache.org/jira/browse/CLOUDSTACK-5962) | Value of Global parameter "custom.diskoffering.size.min" is not reflected in UI ...
+[CLOUDSTACK-5961](https://issues.apache.org/jira/browse/CLOUDSTACK-5961) | CLONE - API: synchronization on the object is broken...
+[CLOUDSTACK-5960](https://issues.apache.org/jira/browse/CLOUDSTACK-5960) | Domain admin or user cannot register a template using S3/Swift object store...
+[CLOUDSTACK-5936](https://issues.apache.org/jira/browse/CLOUDSTACK-5936) | Hyper-V agent should log to windows event viewer...
+[CLOUDSTACK-5935](https://issues.apache.org/jira/browse/CLOUDSTACK-5935) | Problem with VMware snapshot when datastore has a space in its name...
+[CLOUDSTACK-5934](https://issues.apache.org/jira/browse/CLOUDSTACK-5934) | Problem with VMware snapshot when datastore has a space in its name...
+[CLOUDSTACK-5929](https://issues.apache.org/jira/browse/CLOUDSTACK-5929) | [VM Sync] - Vmware - Even when starting Vm fails, startVirtualMachine async job ...
+[CLOUDSTACK-5928](https://issues.apache.org/jira/browse/CLOUDSTACK-5928) | [VM Sync] - Vmware - When a Vm is "suspended" from outside of CloudStack , this ...
+[CLOUDSTACK-5915](https://issues.apache.org/jira/browse/CLOUDSTACK-5915) |  [AWSAPI] Instance launch is inconsistent if there are deleted service offerings...
+[CLOUDSTACK-5891](https://issues.apache.org/jira/browse/CLOUDSTACK-5891) | [VMware] Template detail cpu.corespersocket's value is not honoured...
+[CLOUDSTACK-5870](https://issues.apache.org/jira/browse/CLOUDSTACK-5870) | API support for retrieving UserData...
+[CLOUDSTACK-5865](https://issues.apache.org/jira/browse/CLOUDSTACK-5865) | Unable to use login API if domainId parameter is id and not uuid...
+[CLOUDSTACK-5845](https://issues.apache.org/jira/browse/CLOUDSTACK-5845) | [doc] Document Heterogeneous Secondary Storage Not Supported in Region...
+[CLOUDSTACK-5839](https://issues.apache.org/jira/browse/CLOUDSTACK-5839) | listNetworkServiceProviders API doesn't return several parameters defined in the...
+[CLOUDSTACK-5826](https://issues.apache.org/jira/browse/CLOUDSTACK-5826) | createPod: passing invalid gateway/netmask to the call causes infinite loop exec...
+[CLOUDSTACK-5821](https://issues.apache.org/jira/browse/CLOUDSTACK-5821) | systemvmiso is locked by systevmvm in hyperv...
+[CLOUDSTACK-5812](https://issues.apache.org/jira/browse/CLOUDSTACK-5812) | Secondary ip allocation in Basic zone - the pod is not respected...
+[CLOUDSTACK-5810](https://issues.apache.org/jira/browse/CLOUDSTACK-5810) | addIpToNic: the owner of the secondary ip should be derived from vmInstance obje...
+[CLOUDSTACK-5806](https://issues.apache.org/jira/browse/CLOUDSTACK-5806) | Storage types other than NFS/VMFS can't overprovision...
+[CLOUDSTACK-5785](https://issues.apache.org/jira/browse/CLOUDSTACK-5785) | VM display name cell not updated upon detaching volume from VM...
+[CLOUDSTACK-5770](https://issues.apache.org/jira/browse/CLOUDSTACK-5770) | [Automation] Unexpected Exception while executing DeployVMCmd: StreamCorruptedEx...
+[CLOUDSTACK-5765](https://issues.apache.org/jira/browse/CLOUDSTACK-5765) | [Automation] scale vm failed with error "Unable to serialize"...
+[CLOUDSTACK-5731](https://issues.apache.org/jira/browse/CLOUDSTACK-5731) | [Automation] VM deployment failed with ConcurrentOperationException in vmware...
+[CLOUDSTACK-5729](https://issues.apache.org/jira/browse/CLOUDSTACK-5729) | [Automation]Deletion of a Account reported Success inspite of VM Expunge Failure...
+[CLOUDSTACK-5728](https://issues.apache.org/jira/browse/CLOUDSTACK-5728) | [Automation] ReplaceNetworkACLListCmd command failing with NPE...
+[CLOUDSTACK-5727](https://issues.apache.org/jira/browse/CLOUDSTACK-5727) | [Automation] Inspite of VM Deployment Failure, the job reports success...
+[CLOUDSTACK-5712](https://issues.apache.org/jira/browse/CLOUDSTACK-5712) | [Automation] Failed to stop vm during vm destroy command, observed the error "Un...
+[CLOUDSTACK-5696](https://issues.apache.org/jira/browse/CLOUDSTACK-5696) | [Vmsync]- Stopped state of VM is not synced to CS when VM is stopped outside of ...
+[CLOUDSTACK-5688](https://issues.apache.org/jira/browse/CLOUDSTACK-5688) | NPE when the KVM host is rebooted  on the upgraded environment...
+[CLOUDSTACK-5685](https://issues.apache.org/jira/browse/CLOUDSTACK-5685) | [Vmsync] - When VR is rebooted outside of cloudstack , there is no change in sta...
+[CLOUDSTACK-5678](https://issues.apache.org/jira/browse/CLOUDSTACK-5678) | Cold Storage migration is failing...
+[CLOUDSTACK-5660](https://issues.apache.org/jira/browse/CLOUDSTACK-5660) | Migrate vm live migration succeeds but throws error as ""Failed to migrate the s...
+[CLOUDSTACK-5632](https://issues.apache.org/jira/browse/CLOUDSTACK-5632) | [Automation] XenServer - Template deletion fails with error "Please specify a te...
+[CLOUDSTACK-5597](https://issues.apache.org/jira/browse/CLOUDSTACK-5597) | attachVolume shouldn't create the volume on the primary storage if the vm's root...
+[CLOUDSTACK-5582](https://issues.apache.org/jira/browse/CLOUDSTACK-5582) | kvm - HA is not triggered when host is powered down since the host gets into "Di...
+[CLOUDSTACK-5577](https://issues.apache.org/jira/browse/CLOUDSTACK-5577) | Remote Access VPN and S2S VPN should be treated as two seperate services for Net...
+[CLOUDSTACK-5575](https://issues.apache.org/jira/browse/CLOUDSTACK-5575) | Remote Access VPN and S2S VPN should be treated as two seperate services on VPC...
+[CLOUDSTACK-5563](https://issues.apache.org/jira/browse/CLOUDSTACK-5563) | path field is set to null in volumes table ...
+[CLOUDSTACK-5505](https://issues.apache.org/jira/browse/CLOUDSTACK-5505) | [Automation] Private gateway not getting programmed in VPC router ...
+[CLOUDSTACK-5501](https://issues.apache.org/jira/browse/CLOUDSTACK-5501) | Unable to create more than one vpnConnection per vpn customer gateway...
+[CLOUDSTACK-5496](https://issues.apache.org/jira/browse/CLOUDSTACK-5496) | Account included in ActionEvents is Project Account ID...
+[CLOUDSTACK-5463](https://issues.apache.org/jira/browse/CLOUDSTACK-5463) | Hyper-V does not report stopped VMs...
+[CLOUDSTACK-5429](https://issues.apache.org/jira/browse/CLOUDSTACK-5429) | KVM - Primary store down/Network Failure - Hosts attempt to reboot becasue of pr...
+[CLOUDSTACK-5419](https://issues.apache.org/jira/browse/CLOUDSTACK-5419) | missing parameters in configuration table and to remove unused parameters...
+[CLOUDSTACK-5356](https://issues.apache.org/jira/browse/CLOUDSTACK-5356) | Xenserver - Failed to create snapshot when secondary store was made unavaibale f...
+[CLOUDSTACK-5262](https://issues.apache.org/jira/browse/CLOUDSTACK-5262) | Few of  the snapshot creation from ROOT volume fails when there are concurrent s...
+[CLOUDSTACK-5220](https://issues.apache.org/jira/browse/CLOUDSTACK-5220) | NullPointerException when invalid zone is passed into UsageEventUtils...
+[CLOUDSTACK-5205](https://issues.apache.org/jira/browse/CLOUDSTACK-5205) | System vm startup scripts calculate jvm memory wrong...
+[CLOUDSTACK-5150](https://issues.apache.org/jira/browse/CLOUDSTACK-5150) | Creating template from a VM in Simulator results in incorrect size...
+[CLOUDSTACK-5062](https://issues.apache.org/jira/browse/CLOUDSTACK-5062) | Deleting Load Balancing Rule fails when generating usage events are enabled...
+[CLOUDSTACK-5043](https://issues.apache.org/jira/browse/CLOUDSTACK-5043) | [DOC] Page number missing and words truncated in PDFs since 4.1.1...
+[CLOUDSTACK-5012](https://issues.apache.org/jira/browse/CLOUDSTACK-5012) | Bad data inserted into physical network labels for Zone Create Wizard using VMWa...
+[CLOUDSTACK-4744](https://issues.apache.org/jira/browse/CLOUDSTACK-4744) | updateVolume needs more changes in the context of "Ability to have better contro...
+[CLOUDSTACK-4652](https://issues.apache.org/jira/browse/CLOUDSTACK-4652) | ceph:UI:Noticed 2 records for same volume after migrating instance from one prim...
+[CLOUDSTACK-4639](https://issues.apache.org/jira/browse/CLOUDSTACK-4639) | status of VM is not synced properly when host is HA  during hypervisor failure...
+[CLOUDSTACK-4578](https://issues.apache.org/jira/browse/CLOUDSTACK-4578) | [vmware]SSVM is not getting created if one host down from a cluster...
+[CLOUDSTACK-4568](https://issues.apache.org/jira/browse/CLOUDSTACK-4568) | Need to add this to the release note of 4.2...
+[CLOUDSTACK-4557](https://issues.apache.org/jira/browse/CLOUDSTACK-4557) | ceph:Performance:first time operstions taking more time...
+[CLOUDSTACK-4549](https://issues.apache.org/jira/browse/CLOUDSTACK-4549) | ceph:deployvm from template created from snapshot is failing...
+[CLOUDSTACK-4292](https://issues.apache.org/jira/browse/CLOUDSTACK-4292) | ceph:destroyedvm failed with ArrayIndexexception while expunging...
+[CLOUDSTACK-4126](https://issues.apache.org/jira/browse/CLOUDSTACK-4126) | EN:  Typo error after click "Migrate instance to another host" button under inst...
+[CLOUDSTACK-3994](https://issues.apache.org/jira/browse/CLOUDSTACK-3994) | Wrong error notification is generated when Primary storage (Cluster wide) is add...
+[CLOUDSTACK-2932](https://issues.apache.org/jira/browse/CLOUDSTACK-2932) | Allow deleting of snapshots that have errored out....
+[CLOUDSTACK-2714](https://issues.apache.org/jira/browse/CLOUDSTACK-2714) | Setting tab should not be visible for user accounts ...
+[CLOUDSTACK-2697](https://issues.apache.org/jira/browse/CLOUDSTACK-2697) | cluster id in alert message is null {alertType:: 1 // dataCenterId:: 1 // podId:...
+[CLOUDSTACK-2031](https://issues.apache.org/jira/browse/CLOUDSTACK-2031) | [mipn] support for number of ips per nic limit needs to be added for the multipl...
+
+Version 4.3.1
+-------------
+
+This maintenance release has the following bug fixes:
+
+Bug ID | Description
+--- | ---
+[CLOUDSTACK-6099](https://issues.apache.org/jira/browse/CLOUDSTACK-6099) | live migration is failing for vm deployed using dynamic compute offerings with NPE
+[CLOUDSTACK-7528](https://issues.apache.org/jira/browse/CLOUDSTACK-7528) | More verbose logging when sending alert fails
+[CLOUDSTACK-6624](https://issues.apache.org/jira/browse/CLOUDSTACK-6624) | set specifyIpRanges to true if specifyVlan is set to true
+[CLOUDSTACK-7404](https://issues.apache.org/jira/browse/CLOUDSTACK-7404) | Failed to start an instance when originating template has been deleted 
+[CLOUDSTACK-6531](https://issues.apache.org/jira/browse/CLOUDSTACK-6531) | Stopping the router in case of command failures
+[CLOUDSTACK-6115](https://issues.apache.org/jira/browse/CLOUDSTACK-6115) | TravisCI configuration
+[CLOUDSTACK-7405](https://issues.apache.org/jira/browse/CLOUDSTACK-7405) | allowing VR meta-data to be accessed without trailing slash
+[CLOUDSTACK-7260](https://issues.apache.org/jira/browse/CLOUDSTACK-7260) | Management server not responding after some time for Vmware due to Oom 
+[CLOUDSTACK-7038](https://issues.apache.org/jira/browse/CLOUDSTACK-7038) | Add mysql client dependency for mgmt server pkg for debian
+[CLOUDSTACK-6892](https://issues.apache.org/jira/browse/CLOUDSTACK-6892) | Create separate package for the mysql HA component
+[CLOUDSTACK-7038](https://issues.apache.org/jira/browse/CLOUDSTACK-7038) | Add mysql client dependency for mgmt server/rpms
+[CLOUDSTACK-7193](https://issues.apache.org/jira/browse/CLOUDSTACK-7193) | handle domain ID being an int
+[CLOUDSTACK-7309](https://issues.apache.org/jira/browse/CLOUDSTACK-7309) | using findProjectByProjectAccountIdIncludingRemoved
+[CLOUDSTACK-6886](https://issues.apache.org/jira/browse/CLOUDSTACK-6886) | Fixed the issue created by the SSL feature with the SDX:
+[CLOUDSTACK-6508](https://issues.apache.org/jira/browse/CLOUDSTACK-6508) | impossible to list projects from API with domainid set
+[CLOUDSTACK-4725](https://issues.apache.org/jira/browse/CLOUDSTACK-4725) | if storage pool has different path, but the uuid is the same
+[CLOUDSTACK-7087](https://issues.apache.org/jira/browse/CLOUDSTACK-7087) | Latest OS X VPN client not working Downgrading openswan version to 1:2.6.37-3
+[CLOUDSTACK-6926](https://issues.apache.org/jira/browse/CLOUDSTACK-6926) | removed hard coded jdk dirs and setting java home using readlink and dirname
+[CLOUDSTACK-6665](https://issues.apache.org/jira/browse/CLOUDSTACK-6665) | A fix for vpc routers not releasing dhcp leases.
+[CLOUDSTACK-7006](https://issues.apache.org/jira/browse/CLOUDSTACK-7006) | Restore template ID in ROOT volume usages
+[CLOUDSTACK-6747](https://issues.apache.org/jira/browse/CLOUDSTACK-6747) | test to allow all cidrs on other end of vpc
+[CLOUDSTACK-6272](https://issues.apache.org/jira/browse/CLOUDSTACK-6272) | Fix recover/restore VM actions
+[CLOUDSTACK-6927](https://issues.apache.org/jira/browse/CLOUDSTACK-6927) | store virsh list in list instead of querying libvirt 
+[CLOUDSTACK-6317](https://issues.apache.org/jira/browse/CLOUDSTACK-6317) | [VMware] Tagged VLAN support broken for Management/Control/Storage traffic
+[CLOUDSTACK-5891](https://issues.apache.org/jira/browse/CLOUDSTACK-5891) | [VMware] If a template has been registered and "cpu.corespersocket=X" ,
+[CLOUDSTACK-6478](https://issues.apache.org/jira/browse/CLOUDSTACK-6478) | Failed to download Template when having 3 SSVM's in one
+[CLOUDSTACK-6464](https://issues.apache.org/jira/browse/CLOUDSTACK-6464) | if guest network type is vlan://untagged, and traffic label is used
+[CLOUDSTACK-6816](https://issues.apache.org/jira/browse/CLOUDSTACK-6816) | bugfix: cloudstack-setup-management make /root directory's permission 0777 
+[CLOUDSTACK-6204](https://issues.apache.org/jira/browse/CLOUDSTACK-6204) | applying missed patch
+[CLOUDSTACK-6472](https://issues.apache.org/jira/browse/CLOUDSTACK-6472) | (4.3 specific) listUsageRecords: Pull information from removed items as well
+[CLOUDSTACK-5976](https://issues.apache.org/jira/browse/CLOUDSTACK-5976) | Typo in "ssh_keypairs" table's foreign key constraints on the Upgraded Setup
+[CLOUDSTACK-6240](https://issues.apache.org/jira/browse/CLOUDSTACK-6240) | Fixed updating advanced SG rules for vm nic secondary ip
+[CLOUDSTACK-6509](https://issues.apache.org/jira/browse/CLOUDSTACK-6509) | Cannot import multiple LDAP/AD users into a cloudstack account
+[CLOUDSTACK-6485](https://issues.apache.org/jira/browse/CLOUDSTACK-6485) | private gateway network should not be associated with vpc
+[CLOUDSTACK-6156](https://issues.apache.org/jira/browse/CLOUDSTACK-6156) | removing rampart maven dependencies from awsapi
+[CLOUDSTACK-6433](https://issues.apache.org/jira/browse/CLOUDSTACK-6433) | Don't return success if only one of RvR successfully created
+[CLOUDSTACK-6285](https://issues.apache.org/jira/browse/CLOUDSTACK-6285) | Fix savepassword.sh script for clear out old entries
+[CLOUDSTACK-4665](https://issues.apache.org/jira/browse/CLOUDSTACK-4665) | Check if a snapshot is protected before trying to unprotect
+[CLOUDSTACK-6375](https://issues.apache.org/jira/browse/CLOUDSTACK-6375) | suppress the prompt while installing libssl
+[CLOUDSTACK-4665](https://issues.apache.org/jira/browse/CLOUDSTACK-4665) | Depend on rados-java 0.1.4
+[CLOUDSTACK-6375](https://issues.apache.org/jira/browse/CLOUDSTACK-6375) | suppress the prompt while installing libssl
+[CLOUDSTACK-6360](https://issues.apache.org/jira/browse/CLOUDSTACK-6360) | adding mysql-connector to class path  while starting cloudstack-usage
+[CLOUDSTACK-6326](https://issues.apache.org/jira/browse/CLOUDSTACK-6326) | Fixed password visible in plain text in some of commands in Hyper-v Agent logs.
+[CLOUDSTACK-6325](https://issues.apache.org/jira/browse/CLOUDSTACK-6325) | [hyper-v] fixed cleaning of bin and obj directories when building with mono.
+[CLOUDSTACK-6285](https://issues.apache.org/jira/browse/CLOUDSTACK-6285) | Fix savepassword.sh script for clear out old entries
+[CLOUDSTACK-6299](https://issues.apache.org/jira/browse/CLOUDSTACK-6299) | Fixed apidoc info with base64 encoded
+[CLOUDSTACK-5743](https://issues.apache.org/jira/browse/CLOUDSTACK-5743) | The link generated for a volume/template gives permission error on hyper-v.
+
+Version 4.3.0
+-------------
+
+This major release as the following bug fixes:
+
+Bug ID | Description
+--- | ---
+[CLOUDSTACK-6103](https://issues.apache.org/jira/browse/CLOUDSTACK-6103) | vms with isos attached don't migrate...
+[CLOUDSTACK-6089](https://issues.apache.org/jira/browse/CLOUDSTACK-6089) | resource tags show up in multiples...
+[CLOUDSTACK-6046](https://issues.apache.org/jira/browse/CLOUDSTACK-6046) | CreateVolume from snapshot is failing with S3 as secondary storage and zone-wide...
+[CLOUDSTACK-6040](https://issues.apache.org/jira/browse/CLOUDSTACK-6040) | Failed to configure PF on vm secondary ip for shared network...
+[CLOUDSTACK-6007](https://issues.apache.org/jira/browse/CLOUDSTACK-6007) | [VMware] RestoreVM API fails with NPE...
+[CLOUDSTACK-5986](https://issues.apache.org/jira/browse/CLOUDSTACK-5986) | dnsmasq racy condition result in dnsmasq failed to handout IP address...
+[CLOUDSTACK-5971](https://issues.apache.org/jira/browse/CLOUDSTACK-5971) | Templates created from a snapshots can't be copied to other zones...
+[CLOUDSTACK-5960](https://issues.apache.org/jira/browse/CLOUDSTACK-5960) | Domain admin or user cannot register a template using S3/Swift object store...
+[CLOUDSTACK-5922](https://issues.apache.org/jira/browse/CLOUDSTACK-5922) | Incorrect handling RHEL guests ...
+[CLOUDSTACK-5921](https://issues.apache.org/jira/browse/CLOUDSTACK-5921) | S3 security key is stored in DB unencrypted...
+[CLOUDSTACK-5903](https://issues.apache.org/jira/browse/CLOUDSTACK-5903) | CLONE - OVA files exist for templates created from volumes...
+[CLOUDSTACK-5895](https://issues.apache.org/jira/browse/CLOUDSTACK-5895) | CreateVolumeFromSnapshot can fail in a multiple pod environment with tagged stor...
+[CLOUDSTACK-5886](https://issues.apache.org/jira/browse/CLOUDSTACK-5886) | 4.2.1 upgrade fails on acl migration...
+[CLOUDSTACK-5877](https://issues.apache.org/jira/browse/CLOUDSTACK-5877) | listTemplates does not sort based on sort_key...
+[CLOUDSTACK-5875](https://issues.apache.org/jira/browse/CLOUDSTACK-5875) | No templates in simulator run...
+[CLOUDSTACK-5864](https://issues.apache.org/jira/browse/CLOUDSTACK-5864) | Simulator profile broken ...
+[CLOUDSTACK-5813](https://issues.apache.org/jira/browse/CLOUDSTACK-5813) | With S3 as secondary storage, snapshot taken in one zone cannot be used to creat...
+[CLOUDSTACK-5723](https://issues.apache.org/jira/browse/CLOUDSTACK-5723) | Malfunction agent may block future SSL connection to the server...
+[CLOUDSTACK-5704](https://issues.apache.org/jira/browse/CLOUDSTACK-5704) | OVA files exist for templates created from volumes...
+[CLOUDSTACK-5701](https://issues.apache.org/jira/browse/CLOUDSTACK-5701) | size column is not getting updated in snapshot_store_ref table....
+[CLOUDSTACK-5666](https://issues.apache.org/jira/browse/CLOUDSTACK-5666) | Cant remove a nic when a vm is in the Stopped state ...
+[CLOUDSTACK-5661](https://issues.apache.org/jira/browse/CLOUDSTACK-5661) | [VMware] DetachIsoCmd succeeds even though cdrom is locked by VM as cdrom is mou...
+[CLOUDSTACK-5653](https://issues.apache.org/jira/browse/CLOUDSTACK-5653) | S3 object store as Secondary Storage, the template created from different zone i...
+[CLOUDSTACK-5613](https://issues.apache.org/jira/browse/CLOUDSTACK-5613) | CloudStack 4.2.0 - Usage server is running but tables remain empty...
+[CLOUDSTACK-5608](https://issues.apache.org/jira/browse/CLOUDSTACK-5608) | HyperV Builtin and System vm template entries missing in 4.3 upgrade setup...
+[CLOUDSTACK-5534](https://issues.apache.org/jira/browse/CLOUDSTACK-5534) | MySQL exception raised when searching for users with keyword...
+[CLOUDSTACK-5533](https://issues.apache.org/jira/browse/CLOUDSTACK-5533) | Virtual router in shared network does respond to DNS even when no DNS service is...
+[CLOUDSTACK-5532](https://issues.apache.org/jira/browse/CLOUDSTACK-5532) | Long tag values are not readable within the UI...
+[CLOUDSTACK-5519](https://issues.apache.org/jira/browse/CLOUDSTACK-5519) | [VMWARE] Cancel vCenter tasks if the task invoked by CloudStack failes with time...
+[CLOUDSTACK-5517](https://issues.apache.org/jira/browse/CLOUDSTACK-5517) | NPE observed during "release portable IPs" as part of account cleanup...
+[CLOUDSTACK-5514](https://issues.apache.org/jira/browse/CLOUDSTACK-5514) | Response of listAccounts API call includes removed users...
+[CLOUDSTACK-5513](https://issues.apache.org/jira/browse/CLOUDSTACK-5513) | VM can't start after creating snapshot from it (CS4.2 + VMware 5.1)...
+[CLOUDSTACK-5481](https://issues.apache.org/jira/browse/CLOUDSTACK-5481) | Regular User is unable to use "Add Isolated Network" Button on the UI...
+[CLOUDSTACK-5466](https://issues.apache.org/jira/browse/CLOUDSTACK-5466) | removeIpFromNic not working properly...
+[CLOUDSTACK-5453](https://issues.apache.org/jira/browse/CLOUDSTACK-5453) | Site-to-site VPN connection status monitoring is broken in KVM...
+[CLOUDSTACK-5431](https://issues.apache.org/jira/browse/CLOUDSTACK-5431) | permit 'http' as service type for GSLB rule...
+[CLOUDSTACK-5428](https://issues.apache.org/jira/browse/CLOUDSTACK-5428) | support NetScaler to be configured exclusively for GSLB service and not used for...
+[CLOUDSTACK-5426](https://issues.apache.org/jira/browse/CLOUDSTACK-5426) | Cannot deploy instance having multiple volumes that use different storage tags f...
+[CLOUDSTACK-5422](https://issues.apache.org/jira/browse/CLOUDSTACK-5422) | Changing  XenServer Tools Version 6.1 + doesnt work ...
+[CLOUDSTACK-5417](https://issues.apache.org/jira/browse/CLOUDSTACK-5417) | On network restart for external devices egress rules configured with old CIDR...
+[CLOUDSTACK-5416](https://issues.apache.org/jira/browse/CLOUDSTACK-5416) | [VMware] Not able to add seventh disk to VM in an upgraded setup...
+[CLOUDSTACK-5404](https://issues.apache.org/jira/browse/CLOUDSTACK-5404) | Network usages (bytes sent/received) are saved in the wrong timezone...
+[CLOUDSTACK-5401](https://issues.apache.org/jira/browse/CLOUDSTACK-5401) | VM migration during host maintenance fails if pool.storage.capacity.disablethres...
+[CLOUDSTACK-5391](https://issues.apache.org/jira/browse/CLOUDSTACK-5391) | Change service offering of a stopped vm and then starting it should check host c...
+[CLOUDSTACK-5355](https://issues.apache.org/jira/browse/CLOUDSTACK-5355) | addImageStore should not log password in clear text in the log...
+[CLOUDSTACK-5354](https://issues.apache.org/jira/browse/CLOUDSTACK-5354) | CLONE - UI - normal users are not allowed to edit their own iso...
+[CLOUDSTACK-5352](https://issues.apache.org/jira/browse/CLOUDSTACK-5352) | CPU cap calculated incorrectly for VMs on XenServer hosts...
+[CLOUDSTACK-5332](https://issues.apache.org/jira/browse/CLOUDSTACK-5332) | Network offering don't use new system offering for router...
+[CLOUDSTACK-5303](https://issues.apache.org/jira/browse/CLOUDSTACK-5303) | "snapshot" count and "secondary_storage" count  are not correct in resource_coun...
+[CLOUDSTACK-5302](https://issues.apache.org/jira/browse/CLOUDSTACK-5302) | listHosts API response - value of cpuallocated is always 0%...
+[CLOUDSTACK-5299](https://issues.apache.org/jira/browse/CLOUDSTACK-5299) | Can not get hypervisor type for volumes...
+[CLOUDSTACK-5293](https://issues.apache.org/jira/browse/CLOUDSTACK-5293) |  Error while collecting vm disk stats from hosts if iso is attached to vm...
+[CLOUDSTACK-5285](https://issues.apache.org/jira/browse/CLOUDSTACK-5285) | Correct the API command description for removeIpFromNic...
+[CLOUDSTACK-5261](https://issues.apache.org/jira/browse/CLOUDSTACK-5261) | Ability to publish Alerts via CS Root API...
+[CLOUDSTACK-5260](https://issues.apache.org/jira/browse/CLOUDSTACK-5260) | Vmware 5.1 Deploy Template Error : Read Timeout...
+[CLOUDSTACK-5228](https://issues.apache.org/jira/browse/CLOUDSTACK-5228) | [API] [EIP/ELB enabled Zone] Need to display EIP address as "Public IP Address" ...
+[CLOUDSTACK-5227](https://issues.apache.org/jira/browse/CLOUDSTACK-5227) | Cannot pass Japanese characters as parameter values to API...
+[CLOUDSTACK-5218](https://issues.apache.org/jira/browse/CLOUDSTACK-5218) | CLONE - [Doc] Make VMware vCenter session timeout value configurable....
+[CLOUDSTACK-5199](https://issues.apache.org/jira/browse/CLOUDSTACK-5199) | Cannot restart VM after taking a VM snapshot of an existing VM or reverting a VM...
+[CLOUDSTACK-5141](https://issues.apache.org/jira/browse/CLOUDSTACK-5141) | [Automation] Router deployment failed due to failure in SavePasswordCommand, obs...
+[CLOUDSTACK-5140](https://issues.apache.org/jira/browse/CLOUDSTACK-5140) | A stopped vm cant start after disable threshold has been reached on the storage ...
+[CLOUDSTACK-5138](https://issues.apache.org/jira/browse/CLOUDSTACK-5138) | [Automation] NPE while create template from snapshot...
+[CLOUDSTACK-5122](https://issues.apache.org/jira/browse/CLOUDSTACK-5122) | [VMware] System VMs are getting recreated with old template after upgrading to 4...
+[CLOUDSTACK-5105](https://issues.apache.org/jira/browse/CLOUDSTACK-5105) |  Template/ISO download fails cause the object to disappear from UI...
+[CLOUDSTACK-5098](https://issues.apache.org/jira/browse/CLOUDSTACK-5098) | [UI] Zone view is showing "Add VMware Datacenter" button even though zone is alr...
+[CLOUDSTACK-5092](https://issues.apache.org/jira/browse/CLOUDSTACK-5092) | [Automation] [BVT] Failed to copy template and ISO between zones in xen ...
+[CLOUDSTACK-5076](https://issues.apache.org/jira/browse/CLOUDSTACK-5076) | (Upgrade) reboot VM failed after bridge name change...
+[CLOUDSTACK-5069](https://issues.apache.org/jira/browse/CLOUDSTACK-5069) | Make VMware vCenter session timeout value configurable....
+[CLOUDSTACK-5066](https://issues.apache.org/jira/browse/CLOUDSTACK-5066) | Existed remote access VPN got dropped when adding new VPN users...
+[CLOUDSTACK-5062](https://issues.apache.org/jira/browse/CLOUDSTACK-5062) | Deleting Load Balancing Rule fails when generating usage events are enabled...
+[CLOUDSTACK-5054](https://issues.apache.org/jira/browse/CLOUDSTACK-5054) | vm migration involving storage migration on vmware fails with exception " The ob...
+[CLOUDSTACK-5053](https://issues.apache.org/jira/browse/CLOUDSTACK-5053) | No Qemu-KVM module dependency error message is displayed (if not present)while i...
+[CLOUDSTACK-5042](https://issues.apache.org/jira/browse/CLOUDSTACK-5042) | (Upgrade) Exception when stop VM after upgrade...
+[CLOUDSTACK-5029](https://issues.apache.org/jira/browse/CLOUDSTACK-5029) | cloud-bugtool isn't in release package like release notes say...
+[CLOUDSTACK-5025](https://issues.apache.org/jira/browse/CLOUDSTACK-5025) | display_volume field is set to false by default for VolumeVO object...
+[CLOUDSTACK-5024](https://issues.apache.org/jira/browse/CLOUDSTACK-5024) | listVolumes: add support to list by storage pool (for admin only)...
+[CLOUDSTACK-5017](https://issues.apache.org/jira/browse/CLOUDSTACK-5017) | If SSVM is unavailable DownloadCommands will be routed to mgmt server...
+[CLOUDSTACK-5014](https://issues.apache.org/jira/browse/CLOUDSTACK-5014) | vmware:deployVM with data disk failed with exception...
+[CLOUDSTACK-5012](https://issues.apache.org/jira/browse/CLOUDSTACK-5012) | Bad data inserted into physical network labels for Zone Create Wizard using VMWa...
+[CLOUDSTACK-5008](https://issues.apache.org/jira/browse/CLOUDSTACK-5008) | [VMWARE]Failed to start the VM after performing Cold Migration of Volume to Seco...
+[CLOUDSTACK-5002](https://issues.apache.org/jira/browse/CLOUDSTACK-5002) | unable to destroy vm ;VM destroy failed in Stop i-2-59-VM Command due to You gav...
+[CLOUDSTACK-4998](https://issues.apache.org/jira/browse/CLOUDSTACK-4998) | assignVirtualMachine API has wrong response string, causing Cloudmonkey to crash...
+[CLOUDSTACK-4997](https://issues.apache.org/jira/browse/CLOUDSTACK-4997) | OVS integration is broken...
+[CLOUDSTACK-4973](https://issues.apache.org/jira/browse/CLOUDSTACK-4973) | CLONE - Specified keyboard language is not showing as default in consoleView pas...
+[CLOUDSTACK-4943](https://issues.apache.org/jira/browse/CLOUDSTACK-4943) | Can't create cluster in CS 4.2...
+[CLOUDSTACK-4941](https://issues.apache.org/jira/browse/CLOUDSTACK-4941) | CLONE - Allocation capacity of a cluster during HA...
+[CLOUDSTACK-4935](https://issues.apache.org/jira/browse/CLOUDSTACK-4935) | Adding same network to VM multiple times resulting in failure, No new NIC is gen...
+[CLOUDSTACK-4931](https://issues.apache.org/jira/browse/CLOUDSTACK-4931) | observed NPE with new system vm template...
+[CLOUDSTACK-4913](https://issues.apache.org/jira/browse/CLOUDSTACK-4913) | Disable security group for bridge mode non-security group zone...
+[CLOUDSTACK-4904](https://issues.apache.org/jira/browse/CLOUDSTACK-4904) | Unable to see a derieved template if the parent template is deleted...
+[CLOUDSTACK-4886](https://issues.apache.org/jira/browse/CLOUDSTACK-4886) | cloud-setup-databases not escaping password in shell commands...
+[CLOUDSTACK-4875](https://issues.apache.org/jira/browse/CLOUDSTACK-4875) | VMWARE: vCenter 5.5 - SYSTEM VM: Unable to create deployment for VM...
+[CLOUDSTACK-4861](https://issues.apache.org/jira/browse/CLOUDSTACK-4861) | [VMware] If Guest traffic spans across multiple physical networks, selection of ...
+[CLOUDSTACK-4860](https://issues.apache.org/jira/browse/CLOUDSTACK-4860) | [VMware] Vcenter 5.5  ESXi 5.5 hosts  SSVM CPVM fail to come up to running state...
+[CLOUDSTACK-4856](https://issues.apache.org/jira/browse/CLOUDSTACK-4856) | Optimize on the # of control commands sent by MS to HV host...
+[CLOUDSTACK-4855](https://issues.apache.org/jira/browse/CLOUDSTACK-4855) | Throttle based on the # of outstanding requests to the directly managed HV host ...
+[CLOUDSTACK-4852](https://issues.apache.org/jira/browse/CLOUDSTACK-4852) | Since upgrade to 4.2 only users at the zone-attached domain level can manipulate...
+[CLOUDSTACK-4850](https://issues.apache.org/jira/browse/CLOUDSTACK-4850) | [UCS] using template instead of cloning profile...
+[CLOUDSTACK-4831](https://issues.apache.org/jira/browse/CLOUDSTACK-4831) | Ability for root admin or domain admin to create a network for another user unde...
+[CLOUDSTACK-4830](https://issues.apache.org/jira/browse/CLOUDSTACK-4830) | Allow creation of users and accounts by domain admin in UI...
+[CLOUDSTACK-4826](https://issues.apache.org/jira/browse/CLOUDSTACK-4826) | System VMs fail to start...
+[CLOUDSTACK-4820](https://issues.apache.org/jira/browse/CLOUDSTACK-4820) | TestVPCNetworkGc.test_01_wait_network_gc netacls are not cleared...
+[CLOUDSTACK-4810](https://issues.apache.org/jira/browse/CLOUDSTACK-4810) | Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VM...
+[CLOUDSTACK-4768](https://issues.apache.org/jira/browse/CLOUDSTACK-4768) | [Automation] Race condition; delete the template and create VM at same time; dep...
+[CLOUDSTACK-4750](https://issues.apache.org/jira/browse/CLOUDSTACK-4750) | bond.VLAN mapping in iptables FORWARD chain not created consistently...
+[CLOUDSTACK-4741](https://issues.apache.org/jira/browse/CLOUDSTACK-4741) | URL of ImageStore not in proper format for XenServer...
+[CLOUDSTACK-4740](https://issues.apache.org/jira/browse/CLOUDSTACK-4740) | Some vSphere VMs are shutdown when ACS is restarted...
+[CLOUDSTACK-4734](https://issues.apache.org/jira/browse/CLOUDSTACK-4734) | Creating snapshot from ROOT volume fails with error message - "Failed to create ...
+[CLOUDSTACK-4724](https://issues.apache.org/jira/browse/CLOUDSTACK-4724) | [Vmware] Deploy VM in designated cluster fail if there is only zone wide primary...
+[CLOUDSTACK-4697](https://issues.apache.org/jira/browse/CLOUDSTACK-4697) | Not able to delete Primary storage when there are no hosts in the cluster....
+[CLOUDSTACK-4676](https://issues.apache.org/jira/browse/CLOUDSTACK-4676) | [Baremetal]  baremetal hostename should not be fixed in  kickstart file ...
+[CLOUDSTACK-4670](https://issues.apache.org/jira/browse/CLOUDSTACK-4670) | [Baremetal] Cloudplatform BareMetal installation guide for CP 4.2...
+[CLOUDSTACK-4631](https://issues.apache.org/jira/browse/CLOUDSTACK-4631) | [Automation] Failed to create snapshot from volume due to storage pool missing e...
+[CLOUDSTACK-4620](https://issues.apache.org/jira/browse/CLOUDSTACK-4620) | Vm failed to start on the host on which it was running due to not having enough ...
+[CLOUDSTACK-4616](https://issues.apache.org/jira/browse/CLOUDSTACK-4616) | When system Vms fail to start when host is down ,  link local Ip addresses do no...
+[CLOUDSTACK-4598](https://issues.apache.org/jira/browse/CLOUDSTACK-4598) | [Performance Testing] High delays during deployVM - both network delay and deplo...
+[CLOUDSTACK-4597](https://issues.apache.org/jira/browse/CLOUDSTACK-4597) | Complete Exceptions are getting displayed in the UI where there is an operationa...
+[CLOUDSTACK-4594](https://issues.apache.org/jira/browse/CLOUDSTACK-4594) | [VMWARE] [Upgrade] Failed to revert VM Snapshot which were created before Live S...
+[CLOUDSTACK-4588](https://issues.apache.org/jira/browse/CLOUDSTACK-4588) | [Automation][Vmware] VM deployment failed while creating Volume with NPE...
+[CLOUDSTACK-4577](https://issues.apache.org/jira/browse/CLOUDSTACK-4577) | VMWare:Volumes: Unexpected exception while executing org.apache.cloudstack.api.c...
+[CLOUDSTACK-4543](https://issues.apache.org/jira/browse/CLOUDSTACK-4543) | [Automation] Failed to configure VPC router then reported as deployment failure...
+[CLOUDSTACK-4542](https://issues.apache.org/jira/browse/CLOUDSTACK-4542) | [Automation] Failed to apply DHCP entry in VR and deployment failed ...
+[CLOUDSTACK-4540](https://issues.apache.org/jira/browse/CLOUDSTACK-4540) | [Automation] Parallel deployment - Vmware - When deploying 30 parallel Vms , 16 ...
+[CLOUDSTACK-4506](https://issues.apache.org/jira/browse/CLOUDSTACK-4506) | In a mixed hypervisor setup, destroying a VM whose host has been removed, throws...
+[CLOUDSTACK-4504](https://issues.apache.org/jira/browse/CLOUDSTACK-4504) | VM creation Is failing using the Ubuntu ISO with Xen 6.1 and 6.2...
+[CLOUDSTACK-4450](https://issues.apache.org/jira/browse/CLOUDSTACK-4450) | Possibility of /tmp/xapilog filling up the Root disk on Xenserver ...
+[CLOUDSTACK-4445](https://issues.apache.org/jira/browse/CLOUDSTACK-4445) |  [UI]Edit Icon is used for Dedicate host / Add or Remove VMWARE Datacenter with ...
+[CLOUDSTACK-4428](https://issues.apache.org/jira/browse/CLOUDSTACK-4428) | [UI] "kvm.snapshot.enabled" flag should be taken to account only when snapshot i...
+[CLOUDSTACK-4402](https://issues.apache.org/jira/browse/CLOUDSTACK-4402) | [deleteStoragePool] There is no way to delete Primary storage if the last host w...
+[CLOUDSTACK-4371](https://issues.apache.org/jira/browse/CLOUDSTACK-4371) | [Performance Testing] Basic zone with 20K Hosts, management server restart leave...
+[CLOUDSTACK-4263](https://issues.apache.org/jira/browse/CLOUDSTACK-4263) | Unable to get git number in maven-jgit-buildnumber-plugin, while build cloudstac...
+[CLOUDSTACK-4207](https://issues.apache.org/jira/browse/CLOUDSTACK-4207) | [upgrade] Exception observed after upgrade "jsonParseException: The JsonDeserial...
+[CLOUDSTACK-4061](https://issues.apache.org/jira/browse/CLOUDSTACK-4061) | UI issue with Japanese localized ui...
+[CLOUDSTACK-3806](https://issues.apache.org/jira/browse/CLOUDSTACK-3806) | OS Preference can not be set...
+[CLOUDSTACK-3664](https://issues.apache.org/jira/browse/CLOUDSTACK-3664) | scaling up vms is not considering  parameter "cluster.(memory/cpu).allocated.cap...
+[CLOUDSTACK-3627](https://issues.apache.org/jira/browse/CLOUDSTACK-3627) | Public IP interface(eth2) is not getting confugured with Redundant VR (State = F...
+[CLOUDSTACK-3577](https://issues.apache.org/jira/browse/CLOUDSTACK-3577) | NPE while downloading the template to secondary storage ...
+[CLOUDSTACK-3561](https://issues.apache.org/jira/browse/CLOUDSTACK-3561) | When inputting the nfs server in secondary storage, if once it's required, it al...
+[CLOUDSTACK-3364](https://issues.apache.org/jira/browse/CLOUDSTACK-3364) | normal users are not allowed to edit their own iso...
+[CLOUDSTACK-3266](https://issues.apache.org/jira/browse/CLOUDSTACK-3266) | [UI] Failed to delete Anti affinitygroup for the first time ...
+[CLOUDSTACK-3252](https://issues.apache.org/jira/browse/CLOUDSTACK-3252) | An instance deployed using explicit or implicit dedication doesn't generate a us...
+[CLOUDSTACK-3247](https://issues.apache.org/jira/browse/CLOUDSTACK-3247) | Removing a Disconnected Host throws a NoTransitionException...
+[CLOUDSTACK-3156](https://issues.apache.org/jira/browse/CLOUDSTACK-3156) | needs proper message for failing Add nic command when vmware tools is not instal...
+[CLOUDSTACK-3067](https://issues.apache.org/jira/browse/CLOUDSTACK-3067) | UI for Dedicating POD/Cluster/Host is misleading Icons should be changed....
+[CLOUDSTACK-3027](https://issues.apache.org/jira/browse/CLOUDSTACK-3027) | Object_Store_Refactor - Uploaded template S3 content-type is not appropriate....
+[CLOUDSTACK-2895](https://issues.apache.org/jira/browse/CLOUDSTACK-2895) | Can't start a VM with 3 volumes attached [VMWare]...
+[CLOUDSTACK-2766](https://issues.apache.org/jira/browse/CLOUDSTACK-2766) | [VPC] [UI] Firewall service should not be enabled for acquired public IPs in VPC...
+[CLOUDSTACK-2687](https://issues.apache.org/jira/browse/CLOUDSTACK-2687) | NPE with deploy VM when there are no resources available ...
+[CLOUDSTACK-2570](https://issues.apache.org/jira/browse/CLOUDSTACK-2570) | [UI]Resource Name is mentioned twice with view VNMC devices ...
+[CLOUDSTACK-2562](https://issues.apache.org/jira/browse/CLOUDSTACK-2562) | [VMWARE] As per the code, currently CloudStack fails to program PF/NAT/LB rules ...
+[CLOUDSTACK-2428](https://issues.apache.org/jira/browse/CLOUDSTACK-2428) | HA - When the master host is disconnected , the host status contines to remain i...
+[CLOUDSTACK-2414](https://issues.apache.org/jira/browse/CLOUDSTACK-2414) | NPE while deleting Cisco VNMC provider...
+[CLOUDSTACK-2396](https://issues.apache.org/jira/browse/CLOUDSTACK-2396) | PVLAN - Should not be allowed to create multiple networks with same Vlan  associ...
+[CLOUDSTACK-2199](https://issues.apache.org/jira/browse/CLOUDSTACK-2199) | ID parameter of UpdateConfiguration API should be changed to a different name...
+[CLOUDSTACK-2141](https://issues.apache.org/jira/browse/CLOUDSTACK-2141) | During HA process ,  dead lock is detected - Caused by: com.mysql.jdbc.exception...
+[CLOUDSTACK-1970](https://issues.apache.org/jira/browse/CLOUDSTACK-1970) | Ubuntu - "cloudstack-setup-management" not available in "/usr/bin"...
+[CLOUDSTACK-1889](https://issues.apache.org/jira/browse/CLOUDSTACK-1889) | [UI] Consumed Resource usage details are not available for all the resources...
+[CLOUDSTACK-1868](https://issues.apache.org/jira/browse/CLOUDSTACK-1868) | GetVmStatsCommand throws NullPointerException with VMWare...
+[CLOUDSTACK-1762](https://issues.apache.org/jira/browse/CLOUDSTACK-1762) | [MultipleIpsToNic] addIpToNic should not let network id or broadcast to be assig...
+[CLOUDSTACK-1637](https://issues.apache.org/jira/browse/CLOUDSTACK-1637) | LDAP:UI related issues...
+
+Version 4.2.1
+-------------
+
+Release notes contain the list of [bug fixes](http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.2.1/html/Release_Notes/version-4.2.html#issues-fixed-4.2.1)
+
+Version 4.2.0
+-------------
+Released on October 1 2013.
+Release notes contain the list of [bug fixes](http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.2.0/html/Release_Notes/index.html)
+
+Version 4.1.0
+-------------
+
+This is the second major release of CloudStack from within the Apache Software Foundation, and the
+first major release as a Top-Level Project (TLP). 
+
+Build Tool Changes:
+
+ * The project now uses Maven 3 exclusively to build. 
+
+New Features:
+* CLOUDSTACK-101: OVS support in KVM
+* CLOUDSTACK-132: Mash up marvin into an interactive auto-completing API shell for CloudStack
+* CLOUDSTACK-241: AWS Style Regions
+* CLOUDSTACK-297: Reset SSH Key to access VM (similar to reset password)
+* CLOUDSTACK-299: Egress firewall rules for guest network
+* CLOUDSTACK-306: Support SRX & F5 inline mode
+* CLOUDSTACK-618: API request throttling to avoid malicious attacks on MS per account through frequent API request.
+* CLOUDSTACK-637: AutoScale
+* CLOUDSTACK-644: Resize volumes feature
+* CLOUDSTACK-706: Persistent Networks without running a VM
+* CLOUDSTACK-726: Implement L3 Router functionality in Nicira Nvp Plugin
+* CLOUDSTACK-780: Additional VMX Settings
+* CLOUDSTACK-926: ApiDiscoverService: Implement a plugin mechanism that exposes the list of APIs through a discovery service on the management server
+
+Bug Fixes:
+
+* CLOUDSTACK-1600 Typo in dpkg-buildpackage command
+* CLOUDSTACK-1574 updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type
+* CLOUDSTACK-1562 Replace the short-cut solution of supportting @DB with the formal one
+* CLOUDSTACK-1541 NPE while deleting snapshot :Unexpected exception while executing org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd
+* CLOUDSTACK-1521 Redundant router: Services are not stopped when switch to BACKUP state
+* CLOUDSTACK-1509 Failed to implement network elements and resources while provisioning for persistent network(createVlanIpRange to an account]
+* CLOUDSTACK-1496 List API Performance: listAccounts failing with OOME for high values of pagesize (>1000 )
+* CLOUDSTACK-1487 cloudstack-setup-agent fails to set private.network.device on KVM host add
+* CLOUDSTACK-1485 Add Baremetal Provider back to 4.1 branch
+* CLOUDSTACK-1484 "API Throttling : api.throttling.enabled, Global setting missing"
+* CLOUDSTACK-1473 deleteDomain is failing with NPE
+* CLOUDSTACK-1470 unhandled exception executing api command: deployVirtualMachine
+* CLOUDSTACK-1469 kvm agent: agent service fails to start up
+* CLOUDSTACK-1465 List Zones returns null under create instance when logged is as user
+* CLOUDSTACK-1449 listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned
+* CLOUDSTACK-1447 [UI]Persistent Status is not displayed for VPC Tiers
+* CLOUDSTACK-1436 4.1 management server fails to start from RPM build artifacts
+* CLOUDSTACK-1429 single account is unable to use same vnet across multiple physical networks
+* CLOUDSTACK-1425 unhandled exception executing api command: migrateVirtualMachine & recoverVirtualMachine
+* CLOUDSTACK-1420 Ensure trademarks are properly attributed in publican brand.
+* CLOUDSTACK-1419 Apache-ify and apply trademark logos in the UI
+* CLOUDSTACK-1418 "As regular user , we are not allowed to deploy VM on a shared network."
+* CLOUDSTACK-1417 "When invalid values are passed to createNetwork() , error message does not indicate the parameter name that has invalid values."
+* CLOUDSTACK-1414 Redundant router: BACKUP switch cancelled due to lock timeout after a glitch in network
+* CLOUDSTACK-1403 Storage and console-proxy related error
+* CLOUDSTACK-1402 listRouters API response doesn't return linklocal IP and public IP details
+* CLOUDSTACK-1399 Unhandled exception executing api command: stopVirtualMachine
+* CLOUDSTACK-1397 Static Nat configuration is failing with NPE
+* CLOUDSTACK-1391 EventBus is not getting injected after javelin merge
+* CLOUDSTACK-1383 Deploying basic zone on 4.1 fails in NPE
+* CLOUDSTACK-1382 "vm deploy fails with Error ""cannot find DeployPlannerSelector for vm"""
+* CLOUDSTACK-1375 deploydb failing with acs master
+* CLOUDSTACK-1369 "Ipv6 - In dual Stack network , guest VM does not have the Ipv6 address of the router programmed in /etc/resolv.conf for DNS resolution."
+* CLOUDSTACK-1367 NPE noticed in logs while AgentMonitor is monitoring the host ping interval
+* CLOUDSTACK-1357 "Autoscale: Provisioned VMs from Netscaler not being added to lb vserver, provserver fails with provserver_err_asynctaskpoll"
+* CLOUDSTACK-1350 Management server Stop and start causes previously downloaded ISOs and templates to redownload & reinstall
+* CLOUDSTACK-1347 "Not able to delete network. Error - ""Unable to insert queue item into database, DB is full?"""
+* CLOUDSTACK-1346 "Check to see if external devices are used in the network, is hardcoded for specific devices"
+* CLOUDSTACK-1345 BigSwitch plugin introduces 'VNS' isolation in UI without backend implementation
+* CLOUDSTACK-1344 Typo in use.external.dns setting description
+* CLOUDSTACK-1343 Porting Baremetal related UI changes to ACS
+* CLOUDSTACK-1341 URL for the KEYs file is wrong in the installation guide
+* CLOUDSTACK-1339 ASF 4.1: Management server becomes unresponsive
+* CLOUDSTACK-1338 Deploy VM failed using ISO
+* CLOUDSTACK-1334 vmware.root.disk.controller doesn't work.
+* CLOUDSTACK-1332 IPV6 - Router and guest Vms should be able to use an IPV6 address for external DNS entry.
+* CLOUDSTACK-1331 Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
+* CLOUDSTACK-1330 ec2-run-instances - When -n option is used to deploy multiple Vms API returns error even though few of the Vms have been deployed successfully.
+* CLOUDSTACK-1320 Routers naming convention is changed to hostname
+* CLOUDSTACK-1319 createCustomerVpnGateway response gives TypeError: json.createvpncustomergatewayresponse is undefined
+* CLOUDSTACK-1315 [F5-SRX-InlineMode] Network implement failed with Run time Exception during network upgrade from VR to SRX-F5
+* CLOUDSTACK-1313 Working with Volumes Section Is Missing
+* CLOUDSTACK-1312 "Fix rolling upgrades from 4.0 to 4.1 in 4.1 release, fix db schemas to be same as 4.0"
+* CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup
+* CLOUDSTACK-1303 Ipv6 - java.lang.NullPointerException when executing listnetworks() and deployVirtualMachine() after extending the Ipv4 range of a dual stack network.
+* CLOUDSTACK-1300 section in wrong order in installation guide
+* CLOUDSTACK-1299 Errors in 4.5.5 section of installation guide
+* CLOUDSTACK-1295 NPE in usage parsers due to missing @Component inject
+* CLOUDSTACK-1289 [F5-SRX-InlineMode] Usage stats are not generated for Juniper SRX Firewall in inlinemode
+* CLOUDSTACK-1288 [F5-SRX-InlineMode] classCastException during network restart with cleanup option true
+* CLOUDSTACK-1277 ApiResponseHelper.createUserVmResponse failed to populate password field set from UserVm object
+* CLOUDSTACK-1272 Autoscale: createAutoScaleVmProfile fails due to unable to retrieve Service Offering id
+* CLOUDSTACK-1267 KVM's cloudstack-agent service doesn't log (log4j)
+* CLOUDSTACK-1265 logrotate dnsmasq configuration is wrong
+* CLOUDSTACK-1262 "Failed to Prepare Secondary Storage in VMware,"
+* CLOUDSTACK-1251 Baremetal zone doesn't need primary/secondary storage in UI wizard
+* CLOUDSTACK-1243 Failed to cleanup account :java.lang.NullPointerException
+* CLOUDSTACK-1242 [F5-SRX-InlineMode] Failed to create LB rule with F5-SRX inlinemode deployement
+* CLOUDSTACK-1241 Network apply rules logic is broken
+* CLOUDSTACK-1237 "Register Template fails with ""Cannot find template adapter for XenServer"""
+* CLOUDSTACK-1234 Unable to start KVM agent with 4.1 build
+* CLOUDSTACK-1233 Veewee configuration files are inappropriately identified as ASLv2 licensed files
+* CLOUDSTACK-1232 "Ipv6 - Guest Vms are not able to get Ipaddress when executing dhclient command when using ""/96"" network."
+* CLOUDSTACK-1226 Error while running Cloudstack-setup-databases
+* CLOUDSTACK-1223 Exception while starting jetty server: org.springframework.beans.factory.BeanCreationException Error creating bean with name 'apiServer':
+* CLOUDSTACK-1222 API rate limit configs: removed double quote in upgrade script
+* CLOUDSTACK-1220 Ipv6 - Better error message when deploy Vm fails to get a free Ip address.
+* CLOUDSTACK-1219 Ipv6 - Provide better error messages when deploying a Vm with Ip an address that is outside the network's ip range / if the ip address already is assigned to another Vm.
+* CLOUDSTACK-1216 UUID is null for admin and failed to register user key with 4.1
+* CLOUDSTACK-1210 Make all pluggable services return list of api cmd classes
+* CLOUDSTACK-1206 Failure in Copy of System templates
+* CLOUDSTACK-1205 Ipv6 - Ubuntu 12.10 guest Vms looses default route (after it expiration time ~ 30 mts) when ipv6.autoconfig parameters are disabled except for net.ipv6.conf.lo.autoconf which is enabled.
+* CLOUDSTACK-1204 Fail to create advance zone due to fail to add host
+* CLOUDSTACK-1201 "Failed to create ssh key for user ""cloud"" /var/lib/cloud/management/.ssh/id_rsa and failed to start management server"
+* CLOUDSTACK-1190 Make APIChecker interface throw a single sensible exception
+* CLOUDSTACK-1181 mvn deploy db failing with NPE
+* CLOUDSTACK-1176 Issue with snapshots(create/list)
+* CLOUDSTACK-1174 Snapshots related SQL error
+* CLOUDSTACK-1173 ConsoleProxyResource instantiation exception
+* CLOUDSTACK-1168 Create firewall rule broken
+* CLOUDSTACK-1163 Failed with NPE while creating firewall rule
+* CLOUDSTACK-1161 Differences between 4.1 and master in ongoing-config-of-external-firewalls-lb.xml
+* CLOUDSTACK-1154 Account/Users related API failed due to RegionService inject exception
+* CLOUDSTACK-1153 "Ipv6 - Vm deployment fails with ""n must be positive"" error."
+* CLOUDSTACK-1152 Missing tag in host-add.xml
+* CLOUDSTACK-1141 "Ipv6 - After network restart (and reboot router) , we do not see the existing vms dnsentries not being programmed in the router."
+* CLOUDSTACK-1138 "Providing invalid values for gateway, netmask etc in the zoneWizard blocks the VLAN container to load , throwing an error"
+* CLOUDSTACK-1123 ListStoragePools API broken by refactor
+* CLOUDSTACK-1113 "Ipv6 - Not able to deploy a new VM in this network because of ""Unable to allocate Unique Ipv6 address"""
+* CLOUDSTACK-1112 "Errors in ""Prepare the System VM Template"""
+* CLOUDSTACK-1111 Ipv6 - listRouters() does not return guestipaddress/
+* CLOUDSTACK-1109 "Ipv6 - Unable to expunge User Vms that are ""Destroyed""."
+* CLOUDSTACK-1108 Ipv6 - Not able to restart Networks.
+* CLOUDSTACK-1107 Ipv6 - Unable to extend Ip range for a Ipv6 network using craeteVlanIpRange() command - Error code 530 returned.
+* CLOUDSTACK-1105 "IpV6 - listVirtualMachines() does not return netmask ,gateway,ipaddress."
+* CLOUDSTACK-1104 Ipv6 - listVlanIpRanges() returns error 530.
+* CLOUDSTACK-1103 "IpV6 - listNetwork() command does not retrun gateway,netmask,cidr"
+* CLOUDSTACK-1095 Ipv6 - dhclient command needs to be run manually on the Vms to get the Ipv6 address.
+* CLOUDSTACK-1088 EnableStaticNat error will clear the data in database
+* CLOUDSTACK-1087 Update the Developer Guide for ASFCS 4.1 Release
+* CLOUDSTACK-1083 listUsageRecords api: removed project results in NPE
+* CLOUDSTACK-1082 UI doesn't throw any error message when trying to delete ip range from a network that is in use
+* CLOUDSTACK-1079 Deploying AWSAPI with mvn -pl :cloud-awsapi jetty:run fails
+* CLOUDSTACK-1070 javelin: NPE on executing registerIso API
+* CLOUDSTACK-1064 A type error occurs when trying to add account/register template....
+* CLOUDSTACK-1063 "SG Enabled Advanced Zone - ""Add Guest Networks"" - When user tries to add a guest Network with scope as ""Account"" , he should NOT be presented with ""Offering for shared security group enabled"""
+* CLOUDSTACK-1057 regression of changeServiceForVirtualMachine API - fails to find service offering by serviceOfferingId parameter
+* CLOUDSTACK-1056 S3 secondary storage fails to upload systemvm template due to KVMHA directory
+* CLOUDSTACK-1055 "The overlay still exists when the ""Recurring Snapshots"" dialog is canceled by pressing esc key."
+* CLOUDSTACK-1051 API dispatcher unable to find objectVO corresponding to DeleteTemplatecmd
+* CLOUDSTACK-1050 No Documentation on Adding a Load Balancer Rule
+* CLOUDSTACK-1037 "Make cloudmonkey awesome-er: Online help docs and api discovery, better colored output, parameter value autocompletion"
+* CLOUDSTACK-1029 Enter the token to specified project is malfunctioned
+* CLOUDSTACK-1027 """Update SSL certificate"" button should properly reflect it's functionality"
+* CLOUDSTACK-1024 Regression: Unable to add Xenserver host with latest build
+* CLOUDSTACK-1021 the vlan is not creat to right nic. when i creat multi guest network.
+* CLOUDSTACK-1016 Not able to deploy VM.
+* CLOUDSTACK-1014 Merge ManagementServer and ManagementServerExt
+* CLOUDSTACK-1013 running cloudstack overwrites default public/private ssh keys
+* CLOUDSTACK-1011 KVM host getting disconnected in cluster environment
+* CLOUDSTACK-1010 Host count and Secondary storage count always shows 1 in UI
+* CLOUDSTACK-1002 Not able to start VM.
+* CLOUDSTACK-995  Not able to add the KVM host.
+* CLOUDSTACK-993  """admin"" user is not getting created when management server is started."
+* CLOUDSTACK-987  Sections missing in Working With Snapshots
+* CLOUDSTACK-985  Different MAC address for RvR caused issue in short term network outrage
+* CLOUDSTACK-978  TypeError: instance.displayname is undefined while adding VM's to the LB rule.
+* CLOUDSTACK-968  marvin: vlan should be an attribute of the physical_network and not the zone
+* CLOUDSTACK-959  Missing sub-sections in document section System Service Offerings
+* CLOUDSTACK-938  s2s VPN trouble
+* CLOUDSTACK-928  [Simulator] Latency for Agent Commands - change unit of wait from seconds to milliseconds
+* CLOUDSTACK-863  Non-printable characters (ASCII control character) such as %00 or %0025 are getting stored in raw/non encoded form in the database.
+* CLOUDSTACK-819  Create Account/User API logging password in access logs
+* CLOUDSTACK-799  [Load Test] Check router statistics falls behind in gathering stats by more than 2 times the set value
+* CLOUDSTACK-798  Move usage related cmd classes from cloud-server to cloud-api
+* CLOUDSTACK-736  Integration smoke tests: Fix check for vm name for the deployvm smoke test
+* CLOUDSTACK-734  api_refactoring: CreateAccountCmd fails to send response due to NPE in service layer
+* CLOUDSTACK-725  UI: Error when the Egress rules tab is selected for a network
+* CLOUDSTACK-721  Bytes sent/received in user statistics is empty (CloudStack 4.0)
+* CLOUDSTACK-720  Fail to load a png image when accessing the web console
+* CLOUDSTACK-717  cloudmonkey fails to parse/print response
+* CLOUDSTACK-693  Adding a VPC virtual router to a NiciraNVP enabled network fails
+* CLOUDSTACK-691  A warning dialog box shows after reloading the welcome page
+* CLOUDSTACK-689  RVR: Stop pending flag is not cleared when user start the disconnected router from another host
+* CLOUDSTACK-683  Image Is Missing in the Accessing VM Section
+* CLOUDSTACK-660  Network Traffic Labels are not functional in Marvin
+* CLOUDSTACK-648  The normal users could change their own login password
+* CLOUDSTACK-639  API Refactoring: Adapters for ACL
+* CLOUDSTACK-617  Unable to edit a Sub domain
+* CLOUDSTACK-614  "ListTemplates API is not returning ""Enable SSH Key"" attribute for any given template"
+* CLOUDSTACK-606  Starting VM fails with 'ConcurrentOperationException' in a clustered MS scenario
+* CLOUDSTACK-605  Host physical CPU is incorrectly calculated for Vmware hosts
+* CLOUDSTACK-599  DhcpEntryCommand fails on Router VM on CS4.0 and vSphere5 with Advanced Network Zone
+* CLOUDSTACK-596  DeployVM command takes a lot of time to return job id
+* CLOUDSTACK-584  "typos in ""Apache_CloudStack-4.0.0-incubating-CloudStack_Nicira_NVP_Guide-en-US"""
+* CLOUDSTACK-573  "NPE at ""com.cloud.network.NetworkManagerImpl.networkOfferingIsConfiguredForExternalNetworking(NetworkManagerImpl.java:4345)"" when create network from the network offering having NULL provider for the service"
+* CLOUDSTACK-572  SG Enabled Advanced Zone - Not able to deploy a VM in an account specific shared network.
+* CLOUDSTACK-560  Usage server doesn't work in 4.0.0 due to missing db changes
+* CLOUDSTACK-556  Erratic window behavior in Quick View tooltip
+* CLOUDSTACK-553  "SRX - When adding SRX device make ""Public Network"" - default to ""untrusted"" and ""Private Network"" - default to ""trusted"" as un-editable fields."
+* CLOUDSTACK-552  ]Quick view details for a volume displays scroll bar in place of name of the volume when the name of the volume has more no of characters
+* CLOUDSTACK-539  Cropped Text in UI under Quick View
+* CLOUDSTACK-536  remove citrix cloudpatform from 4.0 build - CloudStack is ASF project
+* CLOUDSTACK-527  List API performance optimization by using DB views and removing UUID conversion.
+* CLOUDSTACK-522  Log requests in cloudmonkey's log file
+* CLOUDSTACK-520  Dependency jar names mismatch with install-non-oss.sh
+* CLOUDSTACK-518  API refactoring -- change @Parameter annotation and remove the @IdentityMapper annotation
+* CLOUDSTACK-514  Marvin and Cloudmonkey don't work when an API target uses https or an alternate path
+* CLOUDSTACK-510  Add button not visible when adding public IPs to physical network
+* CLOUDSTACK-508  CLVM copies template to primary storage unnecessarily
+* CLOUDSTACK-507  fix api docs for listSSHKeyPairs
+* CLOUDSTACK-504  Duplicate guest password scripts in codebase
+* CLOUDSTACK-501  Apidocs and marvin does not know how to handle Autoscaling docs
+* CLOUDSTACK-500  Passwd-server iptables rules are dropped on domr on fresh start or on reboot
+* CLOUDSTACK-499  cloudmonkey CLI can't accept complex parameters
+* CLOUDSTACK-493  2.2.x-3.0 DB upgrade support for Advance SG enabled networks
+* CLOUDSTACK-481  Installation Guide Doc Error
+* CLOUDSTACK-467  Developer's Guide points to cloud.com for API reference
+* CLOUDSTACK-465  French language file quotes are dropping javascript syntax errors
+* CLOUDSTACK-464  "Regression in AWSAPI docs, entire sections removed"
+* CLOUDSTACK-462  A few corrections to make to the 4.0.0 installation guide
+* CLOUDSTACK-459  [Optional Public IP assignment for EIP with Basic Zone] Associate IP Checkbox in Create Network Offering Dialog is Displayed When Elastic LB is Selected
+* CLOUDSTACK-456  License tag in SPEC isn't what RPM is expecting
+* CLOUDSTACK-448  SSVM bootstrap failure on XenServer hosts with E3 CPU
+* CLOUDSTACK-446  "Host going to alert state, if you are adding already added host"
+* CLOUDSTACK-441  Running mgmt server using jetty fails to start api server
+* CLOUDSTACK-435  Vmware network labels are ignored when creating a Zone using basic networking
+* CLOUDSTACK-427  Change hardcoded step number references to dynamic links
+* CLOUDSTACK-424  Updated userdata not propagating to the VR.
+* CLOUDSTACK-417  Handle password server securely to run on port 8080 on VR
+* CLOUDSTACK-416  XCP 1.6beta2 (61002c) - can't add a host
+* CLOUDSTACK-404  Update docs on the usage of cloud-setup-databases
+* CLOUDSTACK-398  Install Guide: Section 11.17.3 (Using VPN with Mac OSX): Not complete?
+* CLOUDSTACK-397  Install Guide: Section 11.1 (Guest Traffic): Diagram is the wrong diagram
+* CLOUDSTACK-390  Install Guide: Section 4.5.7 (Prepare the System VM Template): Links go to cloud.com
+* CLOUDSTACK-378  mavenize marvin on master
+* CLOUDSTACK-377  provide deployment config access to marvin's testcase
+* CLOUDSTACK-373  "static NAT and Firewall is not working on external firewall device SRX, it needs to be implemented"
+* CLOUDSTACK-369  ASF 4.0 - unable to support XenServer 6.1 host
+* CLOUDSTACK-364  Docs point to download.cloud.com for AWS API script
+* CLOUDSTACK-361  Wrong creation of guest networks on a KVM host in Multiple Physical Networks with guest traffic
+* CLOUDSTACK-359  PropagateResourceEventCommand failes in cluster configuration
+* CLOUDSTACK-357  "ISOs can be deleted while still attached to a running VM, and they subsequently cannot be detached from a running VM"
+* CLOUDSTACK-355  "Fix ""count"" in a bunch of API commands"
+* CLOUDSTACK-348  deleteNetwork does not clean up network resource count correctly
+* CLOUDSTACK-347  listNetworks API: return vlan information only when the caller is ROOT admin
+* CLOUDSTACK-346  Cannot add Vmware cluster with class loader conflict exception
+* CLOUDSTACK-335  KVM VPC load balancer not working
+* CLOUDSTACK-333  When Datacenter name in VCenter has spaces Primary Storage (VMFS) discovery will fail
+* CLOUDSTACK-332  """count"" property in list* API response should be equal to how many entries in database, not how many objects in API response"
+* CLOUDSTACK-318  Adding XenServer Host Fails - 6.0.2 fails with 4.0.0
+* CLOUDSTACK-304  Add synchronization for createSnapshot command per host basis
+* CLOUDSTACK-293  "We do awful, hacky things in our spec file for client"
+* CLOUDSTACK-290  3.0.0 template also needed for 2.2.14 to 3.0.5 direct upgrade.
+* CLOUDSTACK-284  listVirtualMachines does not return deleted machines when zone is specified
+* CLOUDSTACK-279  deleteProject fails when executed by the regular user (works fine for root/domain admin)
+* CLOUDSTACK-274  Two error codes mapped to same value in API
+* CLOUDSTACK-271  updatePhysicalNetwork dies with an NPE when the vlan range is empty
+* CLOUDSTACK-256  "vpn:As an admin user , not able to delete VPN user which is present in a regular user's network."
+* CLOUDSTACK-250  Incorrect description of maintenance mode in admin guide
+* CLOUDSTACK-249  Add host id to failed VM deploy alerts
+* CLOUDSTACK-235  Network rate can be set in 2 places. Clarify docs on how this works.
+* CLOUDSTACK-232  Zone infrastructure chart -- disable resource total display
+* CLOUDSTACK-228  UI provides an option to reconnect a disconnected host - ServerApiException is thrown on an attempt
+* CLOUDSTACK-227  ReconnectHostCmd: NullPointerException: Unable to get host Information for XenServer 6.0.2 host - on intentionally changing the traffic labels on the physical network
+* CLOUDSTACK-226  UpdatePhysicalNetworkcommand failed due to java.sql.BatchUpdateException ; Tried to extend the existing Guest VLAN Range of one physical network into the Guest VLAN range of the other physical network
+* CLOUDSTACK-225  API Docs: Request params repeated with different descriptions
+* CLOUDSTACK-222  Admin UI prompts to restart Management server with cancel edit operation
+* CLOUDSTACK-178  Expose name parameter of VM in list Vm view.
+* CLOUDSTACK-130  Clarify docs on tags parameter in API reference
+* CLOUDSTACK-119  Move Agent-Simulator in to the hypervisor plugin model
+* CLOUDSTACK-118  "Status of host resorce stuck in ""ErrorInMaintenance"""
+* CLOUDSTACK-95   IP address allocation not working when a user tries to allocate IP addresses in a Project.
+* CLOUDSTACK-70   Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails
+* CLOUDSTACK-46   Remnants of mycloud remain
+
+Security Fixes:
+
+ * CVE-2012-4501: Apache CloudStack configuration vulnerability
+
+
+Version 4.0.2
+------------------------
+
+This is a maintenance release for the Apache CloudStack 4.0.x series, with no new features.
+
+Issues fixed in this release:
+
+* CLOUDSTACK-354: Display of storage statistics is wrong.
+* CLOUDSTACK-397: Install Guide: Section 11.1 (Guest Traffic): Diagram is the wrong diagram
+* CLOUDSTACK-398: Install Guide: Section 11.17.3 (Using VPN with Mac OSX): Not complete?
+* CLOUDSTACK-462: A few corrections to make to the 4.0.0 installation guide
+* CLOUDSTACK-524: http proxy used by ssvm (secstorage.proxy) NOT working
+* CLOUDSTACK-587: MEMORY_CONSTRAINT_VIOLATIONMemory limits must satisfy:
+* CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host
+* CLOUDSTACK-810: Make DirectAgent thread pool size configurable
+* CLOUDSTACK-976: unable to start cloudstack (error: "java.lang.NoSuchMethodError: org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString([B)Ljava/lang/String;")
+* CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table
+* CLOUDSTACK-990: Documentation issue with libvirtd.conf tcp_port configuration
+* CLOUDSTACK-1088: EnableStaticNat error will clear the data in database
+* CLOUDSTACK-1106: Missing documentation for cloud-setup-databases
+* CLOUDSTACK-1110: Documentation missing "Management Server Load Balancing"
+* CLOUDSTACK-1112: Errors in "Prepare the System VM Template"
+* CLOUDSTACK-1137: Force reconnect of a disconnected state complains about the state of the host.
+* CLOUDSTACK-1150: Documentation for libvirt on Ubuntu 12.04
+* CLOUDSTACK-1151: vmware systemVm template upgrade is missing in 4.0 upgrade
+* CLOUDSTACK-1211: Network operations are Blocked for the Read-only file system of Virtual Router
+* CLOUDSTACK-1265: logrotate dnsmasq configuration is wrong
+* CLOUDSTACK-1291: duplicate arguments in commands.xml prevents cloudapis.py to run to completion
+* CLOUDSTACK-1298: typo in deb package setup
+* CLOUDSTACK-1299: Errors in 4.5.5 section of installation guide
+* CLOUDSTACK-1300: section in wrong order in installation guide
+* CLOUDSTACK-1341: URL for the KEYs file is wrong in the installation guide
+* CLOUDSTACK-1419: Apache-ify and apply trademark logos in the UI
+* CLOUDSTACK-1420: Ensure trademarks are properly attributed in publican brand.
+* CLOUDSTACK-1589: Ubuntu 4.0 packages depend on non-existent chkconfig
+* CLOUDSTACK-1629: Need to move location or conflict with antlr
+* CLOUDSTACK-1642: Add support CentOS 6.4
+* CLOUDSTACK-1648: Unable to add KVM host
+* CLOUDSTACK-1652: /etc/hosts error in virtual router when deploy instance with the name same to previous instances
+* CLOUDSTACK-1666: KVM VPC NetworkUsage doesnot work
+* CLOUDSTACK-1668: IP conflict in VPC tier
+* CLOUDSTACK-1761: Available local storage disk capacity incorrectly reported in KVM to manager.
+* CLOUDSTACK-1845: KVM - storage migration often fails
+* CLOUDSTACK-1846: KVM - storage pools can silently fail to be unregistered, leading to failure to register later
+* CLOUDSTACK-2003: Deleting domain while deleted account is cleaning up leaves VMs expunging forever due to 'Failed to update resource count'
+* CLOUDSTACK-2090: Upgrade from version 4.0.1 to version 4.0.2 triggers the 4.0.0 to 4.0.1. 
+* CLOUDSTACK-2091: Error in API documentation for 4.0.x.
+
+
+Version 4.0.1-incubating
+------------------------
+
+This is a bugfix release for Apache CloudStack 4.0.0-incubating, with no new features. 
+
+Security Fixes:
+
+* CVE-2012-5616: Local Information Disclosure Vulnerability (See CLOUDSTACK-505)
+
+Bugs fixed in this release:
+
+* CLOUDSTACK-359: PropagateResourceEventCommand fails in cluster configuration
+* CLOUDSTACK-374: When running cloud-setup-databases, it auto chooses the highest priority nic (lowest number ie: eth0)
+* CLOUDSTACK-389: Install Guide: Section 4.5.5 (Prepare NFS Shares): Confusing statement about iSCSI
+* CLOUDSTACK-395: Primary Storage and Secondary Storage sections missing sub-sections
+* CLOUDSTACK-411: Add another step during kvm agent installation on Ubuntu machine
+* CLOUDSTACK-415: restartNetwork call causes VM to be unreachable when Nicira based SDN is used.
+* CLOUDSTACK-422: XSL files missing license header.
+* CLOUDSTACK-426: SetVPCStaticNatRules unimplemented for KVM.
+* CLOUDSTACK-448: SSVM bootstrap failure on XenServer hosts with E3 CPU.
+* CLOUDSTACK-465: French language file quotes are dropping javascript syntax errors.
+* CLOUDSTACK-473: API Doc for uploadCustomCertificate doesn't explain how to use the optional parameters well.
+* CLOUDSTACK-480: Installation Documentation error: Section 4.5.5.2 needs to mention nfs-kernel-server.
+* CLOUDSTACK-481: Installation Guide Doc Error
+* CLOUDSTACK-498: Missing dependency in RPM of KVM Agent.
+* CLOUDSTACK-502: VPC router needs to resolve its hostname.
+* CLOUDSTACK-505: cloudstack logs the private key in plaintext.
+* CLOUDSTACK-507: fix api docs for listSSHKeyPairs.
+* CLOUDSTACK-515: NVP installation.
+* CLOUDSTACK-536: remove citrix cloudpatform from 4.0 build - CloudStack is ASF project.
+* CLOUDSTACK-560: Usage server doesn't work in 4.0.0 due to missing db changes.
+* CLOUDSTACK-580: Packages are named with 4.0 with 4.0.1 build.
+* CLOUDSTACK-591: Wrong vnet in iptables on KVM hypervisors after VM reboot.
+* CLOUDSTACK-595: Recreate root volume scenarios doesn't work in VMware
+* CLOUDSTACK-603: Upgrade from 4.0 to 4.0.1 is not enabled.
+* CLOUDSTACK-605: Host physical CPU is incorrectly calculated for VMware host
+* CLOUDSTACK-622: In the add primary storage dialog in the ui the RBD fields don't disappear when changing from RBD to another protocol.
+* CLOUDSTACK-683: Image is missing in the Accessing VM Section
+* CLOUDSTACK-685: CloudStack 4.0 Network Usage is ZERO
+* CLOUDSTACK-938: s2s VPN trouble
+* CLOUDSTACK-961: Installation docs don't detail dependencies for building RPMs
+* CLOUDSTACK-995: Not able to add the KVM host
+
+
+Version 4.0.0-incubating
+------------------------
+
+This is the first release of CloudStack from within the Apache Software Foundation.
+
+Build Tool Changes:
+
+ * The project now uses a combination of maven3 and ant for building
+ * License header auditing is now implemented via the Apache RAT Maven plugin
+ * Some integrations have been disabled in the default build, due to the license types of our dependencies (See README.md for details on how to build with the optional capabilities)
+
+New Features:
+
+ * Inter-VLAN Routing (VPC)
+ * Site-to-Site VPN
+ * Local Storage Support for Data Volumes
+ * Virtual Resource Tagging
+ * Secure Console Access on XenServer
+ * Added the ability to create a VM without immediately starting it (via API)
+ * Upload an Existing Volume to a Virtual Machine
+ * Dedicated High-Availability Hosts
+ * Support for Amazon Web Services API (formerly a separate package)
+ * AWS API Extensions to include Tagging
+ * Support for Nicira NVP (L2)
+ * Ceph RBD Support for KVM
+ * Support for Caringo as Secondary Storage
+ * KVM Hypervisor support upgraded to work with Ubuntu 12.04 and RHEL 6.3
+
+Security Fixes:
+
+ * CVE-2012-4501: Apache CloudStack configuration vulnerability


[03/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with NPE

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/56c7fc80
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/56c7fc80
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/56c7fc80

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 56c7fc800ad12e2e3ccbf7fc79aaacd709f036b2
Parents: bd8eaf8
Author: Bharat Kumar <bh...@citrix.com>
Authored: Mon Sep 8 16:17:55 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Sep 10 13:27:21 2014 +0200

----------------------------------------------------------------------
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56c7fc80/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 8a228ff..91af527 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1863,7 +1863,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
             vmSrc.addNic(nic);
         }
 
-        VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+        VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);
         _networkMgr.prepareNicForMigration(profile, dest);
         volumeMgr.prepareForMigration(profile, dest);
 


[14/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a694d4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a694d4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a694d4d

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 7a694d4deb0d74a18c7bac8bfffa8faf6fa5d835
Parents: 4d065b9
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Sep 10 11:46:46 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Sep 16 12:25:10 2014 +0200

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a694d4d/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index 88f4841..b4ef56e 100755
--- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
+++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -109,4 +109,4 @@ do
 done
 
 /usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $(($(date +%s) - $lastdate)) seconds, rebooting system!"
-reboot -f
+echo b > /proc/sysrq-trigger
\ No newline at end of file


[04/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
Merge remote-tracking branch 'origin/hotfix/4.4/CLOUDSTACK-6099' into 4.4


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01527635
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01527635
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01527635

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 015276350e41b30bde049ca0852811ed6262da16
Parents: 3a0f155 56c7fc8
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Sep 10 13:59:14 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Sep 10 13:59:14 2014 +0200

----------------------------------------------------------------------
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[09/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
Remove the misc tests from travis as they do not exist in 4.4


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0066b77d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0066b77d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0066b77d

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 0066b77d57c574925ef33495e9a81f4304d63ae9
Parents: 723eaef
Author: imduffy15 <ia...@ianduffy.ie>
Authored: Mon Sep 15 16:18:57 2014 +0100
Committer: imduffy15 <ia...@ianduffy.ie>
Committed: Mon Sep 15 16:18:57 2014 +0100

----------------------------------------------------------------------
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0066b77d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 007d466..8ba3c4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ notifications:
 env:
 - TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range test_iso test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning"
 - TESTS="test_portable_publicip test_primary_storage test_privategw_acl test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot test_resource_detail test_routers"
-- TESTS="test_secondary_storage test_service_offerings test_ssvm test_templates misc/test_deploy_vm test_vm_life_cycle test_volumes test_vpc_vpn"
+- TESTS="test_secondary_storage test_service_offerings test_ssvm test_templates test_vm_life_cycle test_volumes test_vpc_vpn"
 before_install: travis_wait 30 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
 before_script: travis_wait 30 ./tools/travis/before_script.sh


[02/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
appliance: fix newer debian iso links and checksums for debian

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit ac5309b8b47ddb1e5588a2d5090f2bcce0e7c2a4)

Conflicts:
	tools/appliance/definitions/systemvm64template/definition.rb
	tools/appliance/definitions/systemvmtemplate/definition.rb


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a0f1550
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a0f1550
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a0f1550

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 3a0f1550289a8a2a50b0f786821cec2e5c914e62
Parents: f4f5ea3
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Sep 9 18:37:15 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Sep 10 12:41:37 2014 +0200

----------------------------------------------------------------------
 tools/appliance/definitions/systemvm64template/definition.rb | 6 +++---
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a0f1550/tools/appliance/definitions/systemvm64template/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb b/tools/appliance/definitions/systemvm64template/definition.rb
index f9308a0..bd59025 100644
--- a/tools/appliance/definitions/systemvm64template/definition.rb
+++ b/tools/appliance/definitions/systemvm64template/definition.rb
@@ -3,9 +3,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
-  :iso_file => "debian-7.4.0-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso",
-  :iso_md5 => "e7e9433973f082a297793c3c5010b2c5",
+  :iso_file => "debian-7.5.0-amd64-netinst.iso",
+  :iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso",
+  :iso_md5 => "8fdb6715228ea90faba58cb84644d296",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
      '<Esc>',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a0f1550/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index fcaab4d..9b57379 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -3,9 +3,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
-  :iso_file => "debian-7.4.0-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/i386/iso-cd/debian-7.4.0-i386-netinst.iso",
-  :iso_md5 => "7339b668a81b417ac023d73739dc6a03",
+  :iso_file => "debian-7.5.0-i386-netinst.iso",
+  :iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso",
+  :iso_md5 => "0e6eaacb5a5828473afe90f6df9c8f16",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
      '<Esc>',


[08/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
CLOUDSTACK-6738: pre-seed expunge delay and interval to 60s


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/723eaefd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/723eaefd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/723eaefd

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 723eaefdf9c139d920a94202962cfd691589c304
Parents: 213bdbd
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Sep 15 14:45:05 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Sep 15 14:45:05 2014 +0200

----------------------------------------------------------------------
 developer/developer-prefill.sql | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/723eaefd/developer/developer-prefill.sql
----------------------------------------------------------------------
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index 7b423a1..e5fb4e3 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -56,6 +56,14 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
 
 INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
             VALUES ('Advanced', 'DEFAULT', 'management-server',
+            'expunge.delay', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+            VALUES ('Advanced', 'DEFAULT', 'management-server',
+            'expunge.interval', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+            VALUES ('Advanced', 'DEFAULT', 'management-server',
             'system.vm.use.local.storage', 'true');
 
 -- Add developer configuration entry; allows management server to be run as a user other than "cloud"


[05/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
Add "Edit Tags" functionality to SecurityGroup rules in UI

Signed-off-by: Ilia Shakitko <i....@tech.leaseweb.com>
(cherry picked from commit 281c866206036235790773fbcb86edede0ac739d)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f7d9ea29
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7d9ea29
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7d9ea29

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: f7d9ea291be808a33829172234164e188673d9ed
Parents: 0152763
Author: Ilia Shakitko <i....@tech.leaseweb.com>
Authored: Thu Sep 11 12:25:09 2014 +0200
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Sep 11 15:48:59 2014 +0200

----------------------------------------------------------------------
 ui/scripts/network.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7d9ea29/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index c0a9205..f6a8f3d 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -22,7 +22,8 @@
             protocol: elem.protocol,
             startport: elem.startport,
             endport: elem.endport,
-            cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', elem.securitygroupname)
+            cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', elem.securitygroupname),
+            tags: elem.tags
         };
 
         if (elemData.startport == 0 && elemData.endport) {
@@ -4837,6 +4838,10 @@
                                         }
                                     },
                                     ignoreEmptyFields: true,
+                                    tags: cloudStack.api.tags({
+                                        resourceType: 'SecurityGroupRule',
+                                        contextId: 'multiRule'
+                                    }),
                                     dataProvider: function(args) {
                                         $.ajax({
                                             url: createURL('listSecurityGroups'),
@@ -5032,6 +5037,10 @@
                                         }
                                     },
                                     ignoreEmptyFields: true,
+                                    tags: cloudStack.api.tags({
+                                        resourceType: 'SecurityGroupRule',
+                                        contextId: 'multiRule'
+                                    }),
                                     dataProvider: function(args) {
                                         $.ajax({
                                             url: createURL('listSecurityGroups'),


[13/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d065b9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d065b9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d065b9a

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 4d065b9a3a336d59902c266202c1094509c007d2
Parents: 528ac4c
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Sep 9 22:19:54 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Sep 16 12:25:07 2014 +0200

----------------------------------------------------------------------
 .../hypervisor/xen/discoverer/XcpServerDiscoverer.java  |  1 +
 .../hypervisor/xen/resource/CitrixResourceBase.java     |  8 ++++++--
 scripts/vm/hypervisor/xenserver/launch_hb.sh            |  7 ++++++-
 scripts/vm/hypervisor/xenserver/vmopspremium            |  3 ++-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh         | 12 ++++++++----
 server/src/com/cloud/configuration/Config.java          | 10 +++++++++-
 .../cloud/configuration/ConfigurationManagerImpl.java   |  1 +
 server/src/com/cloud/resource/DiscovererBase.java       |  1 +
 .../root/redundant_router/check_heartbeat.sh.templ      |  4 ++--
 9 files changed, 36 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 0e7cf74..eda28f3 100755
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -347,6 +347,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
                 details.put("wait", Integer.toString(_wait));
                 params.put("migratewait", _configDao.getValue(Config.MigrateWait.toString()));
                 params.put(Config.XenMaxNics.toString().toLowerCase(), _configDao.getValue(Config.XenMaxNics.toString()));
+                params.put(Config.XenHeartBeatTimeout.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatTimeout.toString()));
                 params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatInterval.toString()));
                 params.put(Config.InstanceName.toString().toLowerCase(), _instance);
                 details.put(Config.InstanceName.toString().toLowerCase(), _instance);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c1c9795..644ef65 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -289,6 +289,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
     protected IAgentControl _agentControl;
 
     final int _maxWeight = 256;
+    protected int _heartbeatTimeout = 120;
     protected int _heartbeatInterval = 60;
     protected final XsHost _host = new XsHost();
 
@@ -4603,8 +4604,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
     }
 
     protected boolean launchHeartBeat(Connection conn) {
-        String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer
-                .toString(_heartbeatInterval));
+        String result = callHostPluginPremium(conn, "heartbeat",
+                "host", _host.uuid,
+                "timeout", Integer.toString(_heartbeatTimeout),
+                "interval", Integer.toString(_heartbeatInterval));
         if (result == null || !result.contains("> DONE <")) {
             s_logger.warn("Unable to launch the heartbeat process on " + _host.ip);
             return false;
@@ -5674,6 +5677,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         _storageNetworkName1 = (String)params.get("storage.network.device1");
         _storageNetworkName2 = (String)params.get("storage.network.device2");
 
+        _heartbeatTimeout = NumbersUtil.parseInt((String)params.get("xen.heartbeat.timeout"), 120);
         _heartbeatInterval = NumbersUtil.parseInt((String)params.get("xen.heartbeat.interval"), 60);
 
         String value = (String)params.get("wait");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/scripts/vm/hypervisor/xenserver/launch_hb.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/launch_hb.sh b/scripts/vm/hypervisor/xenserver/launch_hb.sh
index 289eb5f..0a12b7a 100755
--- a/scripts/vm/hypervisor/xenserver/launch_hb.sh
+++ b/scripts/vm/hypervisor/xenserver/launch_hb.sh
@@ -33,6 +33,11 @@ if [ -z $2 ]; then
   exit 3
 fi
 
+if [ -z $3 ]; then
+  usage
+  exit 3
+fi
+
 if [ ! -f /opt/cloud/bin/xenheartbeat.sh ]; then
   printf "Error: Unable to find xenheartbeat.sh to launch\n"
   exit 4
@@ -42,5 +47,5 @@ for psid in `ps -ef | grep xenheartbeat | grep -v grep | awk '{print $2}'`; do
   kill $psid
 done
 
-nohup /opt/cloud/bin/xenheartbeat.sh $1 $2 >/dev/null 2>/dev/null &
+nohup /opt/cloud/bin/xenheartbeat.sh $1 $2 $3 >/dev/null 2>/dev/null &
 echo "======> DONE <======"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/scripts/vm/hypervisor/xenserver/vmopspremium
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmopspremium b/scripts/vm/hypervisor/xenserver/vmopspremium
index 2887436..f218644 100755
--- a/scripts/vm/hypervisor/xenserver/vmopspremium
+++ b/scripts/vm/hypervisor/xenserver/vmopspremium
@@ -127,9 +127,10 @@ def setup_heartbeat_file(session, args):
 @echo
 def heartbeat(session, args):
     host = args['host']
+    timeout = args['timeout']
     interval = args['interval']
     try: 
-       cmd = ["/bin/bash", "/opt/cloud/bin/launch_hb.sh", host, interval]
+       cmd = ["/bin/bash", "/opt/cloud/bin/launch_hb.sh", host, timeout, interval]
        txt = util.pread2(cmd)
     except:
        txt='fail'

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index d5a5d86..88f4841 100755
--- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
+++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -26,11 +26,15 @@ usage() {
 if [ -z $1 ]; then
   usage
   exit 2
+else
+  host=$1
 fi
 
 if [ -z $2 ]; then
   usage
   exit 3
+else
+  timeout=$2
 fi
 
 if [ ! -z $3 ]; then
@@ -39,7 +43,7 @@ else
   interval=5
 fi
 
-if [ $interval -gt $2 ]; then
+if [ $interval -gt $timeout ]; then
   usage
   exit 3
 fi
@@ -47,7 +51,7 @@ fi
 file=/opt/cloud/bin/heartbeat
 lastdate=$(($(date +%s) + $interval))
 
-while [ $(date +%s) -lt $(($lastdate + $2)) ]
+while [ $(date +%s) -lt $(($lastdate + $timeout)) ]
 do
   sleep $interval
 
@@ -69,7 +73,7 @@ do
   for dir in $dirs
   do
     if [ -d $dir ]; then
-      hb=$dir/hb-$1
+      hb=$dir/hb-$host
       date +%s | dd of=$hb count=100 bs=1 2>/dev/null
       if [ $? -ne 0 ]; then
         /usr/bin/logger -t heartbeat "Potential problem with $hb: not reachable since $(($(date +%s) - $lastdate)) seconds"
@@ -89,7 +93,7 @@ do
   do
     mp=`mount | grep $dir`
     if [ -n "$mp" ]; then
-      hb=$dir/hb-$1
+      hb=$dir/hb-$host
       date +%s | dd of=$hb count=100 bs=1 2>/dev/null
       if [ $? -ne 0 ]; then
         /usr/bin/logger -t heartbeat "Potential problem with $hb: not reachable since $(($(date +%s) - $lastdate)) seconds"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index bf72dc2..56ae5f9 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -1099,13 +1099,21 @@ public enum Config {
             null),
     XenSetupMultipath("Advanced", ManagementServer.class, String.class, "xen.setup.multipath", "false", "Setup the host to do multipath", null),
     XenBondStorageNic("Advanced", ManagementServer.class, String.class, "xen.bond.storage.nics", null, "Attempt to bond the two networks if found", null),
+    XenHeartBeatTimeout(
+            "Advanced",
+            ManagementServer.class,
+            Integer.class,
+            "xen.heartbeat.timeout",
+            "120",
+            "heartbeat timeout to use when implementing XenServer Self Fencing",
+            null),
     XenHeartBeatInterval(
             "Advanced",
             ManagementServer.class,
             Integer.class,
             "xen.heartbeat.interval",
             "60",
-            "heartbeat to use when implementing XenServer Self Fencing",
+            "heartbeat interval to use when checking before XenServer Self Fencing",
             null),
     XenGuestNetwork("Hidden", ManagementServer.class, String.class, "xen.guest.network.device", null, "Specify for guest network name label", null),
     XenMaxNics("Advanced", AgentManager.class, Integer.class, "xen.nics.max", "7", "Maximum allowed nics for Vms created on Xen", null),

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 010ca7a..48b3cab 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -363,6 +363,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         configValuesForValidation.add("storage.cleanup.interval");
         configValuesForValidation.add("wait");
         configValuesForValidation.add("xen.heartbeat.interval");
+        configValuesForValidation.add("xen.heartbeat.timeout");
         configValuesForValidation.add("incorrect.login.attempts.allowed");
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/server/src/com/cloud/resource/DiscovererBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/DiscovererBase.java b/server/src/com/cloud/resource/DiscovererBase.java
index 871dc15..63f2ab5 100644
--- a/server/src/com/cloud/resource/DiscovererBase.java
+++ b/server/src/com/cloud/resource/DiscovererBase.java
@@ -137,6 +137,7 @@ public abstract class DiscovererBase extends AdapterBase implements Discoverer {
         params.put("migratewait", _configDao.getValue(Config.MigrateWait.toString()));
         params.put(Config.XenMaxNics.toString().toLowerCase(), _configDao.getValue(Config.XenMaxNics.toString()));
         params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatInterval.toString()));
+        params.put(Config.XenHeartBeatTimeout.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatTimeout.toString()));
         params.put("router.aggregation.command.each.timeout", _configDao.getValue(Config.RouterAggregationCommandEachTimeout.toString()));
 
         return params;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ b/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
index d6bdc5d..d7d211e 100755
--- a/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
+++ b/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
@@ -45,8 +45,8 @@ then
         [RROUTER_BIN_PATH]/primary-backup.sh fault >> [RROUTER_LOG] 2>&1
         service keepalived stop >> [RROUTER_LOG] 2>&1
         service conntrackd stop >> [RROUTER_LOG] 2>&1
-	pkill -9 keepalived >> [RROUTER_LOG] 2>&1
-	pkill -9 conntrackd >> [RROUTER_LOG] 2>&1
+        pkill -9 keepalived >> [RROUTER_LOG] 2>&1
+        pkill -9 conntrackd >> [RROUTER_LOG] 2>&1
         echo Status: FAULT \(keepalived process is dead\) >> [RROUTER_LOG]
         exit
     fi


[10/15] Cleaning the README, INSTALL and CHANGES file

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/INSTALL.md
----------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index b92739a..74bac0c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,94 +1,55 @@
-This document describes how to develop, build, package and install Apache
-CloudStack. For more information please refer to:
+# Apache CloudStack Installation basics
 
-    http://cloudstack.apache.org
+This document describes how to develop, build, package and install Apache
+CloudStack. For more information please refer to the official [documentation](http://docs.cloudstack.apache.org)
+or the developer [wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home).
 
 Apache CloudStack developers use various platforms for development, this guide
-was tested against a CentOS 6.2 x86_64 setup.
+was tested against a CentOS 6.5 x86_64 setup.
 
-Refer to the [wiki](http://cwiki.apache.org/confluence/display/CLOUDSTACK/Index)
-for the latest information, especially:
-
-  - [Setting up development environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment) for Apache CloudStack.
-  - [Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack) Apache CloudStack.
+* [Setting up development environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment) for Apache CloudStack.
+* [Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack) Apache CloudStack.
 
 ## Setting up Development Environment
 
-### Installing Tools and Dependencies
-
 Install tools and dependencies used for development:
 
     $ yum install git ant ant-devel java-1.7.0-openjdk java-1.7.0-openjdk-devel
     mysql mysql-server tomcat6 mkisofs gcc python MySQL-python openssh-clients wget
 
-Set up Maven (3.0.5):
-
-    $ wget http://www.us.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
-    $ cd /usr/local/ # or any path
-    $ tar -zxvf apache-maven-3.0.5-bin.tar.gz
-    $ echo export M2_HOME=/usr/local/apache-maven-3.0.5 >> ~/.bashrc # or .zshrc or .profile
-    $ echo export PATH=${M2_HOME}/bin:${PATH} >> ~/.bashrc # or .zshrc or .profile
-
-Note: Tomcat 6.0.35 has some known issue with Apache CloudStack, please use Tomcat
-6.0.33 from http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.33/bin
-
-### Configure Environment
+    #yum -y update
+    #yum -y install java-1.7.0-openjdk
+    #yum -y install java-1.7.0-openjdk-devel
+    #yum -y install mysql-server
+    #yum -y install git
+    #yum -y install genisoimage
 
-Set CATALINA_HOME to path where you extract/install tomcat, put them in your
-.bashrc or .zshrc or .profile:
-
-    $ echo export CATALINA_HOME=/usr/share/tomcat6/ >> ~/.bashrc
-
-Fix permissions on CATALINA_HOME:
-
-    $ chown -R <you>:<your-group> $CATALINA_HOME
-
-Generate you ssh keys, useful for ssh-ing to your hosts and vm etc.:
-
-    $ ssh-keygen -t rsa -q
-
-Apache CloudStack uses some ports, make sure at least those used by the management
-server are available and not blocked by any local firewall. Following ports are
-used by Apache CloudStack and its entities:
-
-    8080: API Server (authenticated), browser or CLI client to management server
-    8096: API Server (unauthenticated), browser or CLI client to management server
-    8787: Remote java debug debugging port, from IDE to management server
-    9090: Management server to management server (cluster)
-    7080: AWS API Server to which an AWS client can connect
-    80/443: HTTP client to Secondary Storage VM (template download)
-    111/2049: Secondary Storage to NFS server
-    3922: Port used to ssh/scp into system vms (SSVM, CPVM, VR)
-    8250: Agent (SSVM, CPVM, VR) to management server
-    22, 80, 443: XenServer, XAPI
-    22: KVM
-    443: vCenter
-    53: DNS
-    111/2049: NFS
-    3306: MySQL Server to which the management server connects
+Set up Maven (3.0.5):
 
-### Configuring MySQL Server
+    #wget http://www.us.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
+    #tar -zxvf apache-maven-3.0.5-bin.tar.gz -C /usr/local
+    #cd /usr/local
+    #ln -s apache-maven-3.0.5 maven
+    #echo export M2_HOME=/usr/local/maven >> ~/.bashrc # or .zshrc or .profile
+    #echo export PATH=/usr/local/maven/bin:${PATH} >> ~/.bashrc # or .zshrc or .profile
+    #source ~/.bashrc
 
 Start the MySQL service:
 
     $ service mysqld start
 
-### Getting the Source Code
+## Getting the Source Code
 
 You may get the source code from the repository hosted on Apache:
 
-    $ git clone git://git.apache.org/cloudstack.git
+    $ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
 
-Or, you may fork a repository from the official Apache CloudStack mirror by
-Apache on [Github](https://github.com/apache/cloudstack)
+Or, you may fork the repository from the official Apache CloudStack mirror on [Github](https://github.com/apache/cloudstack)
 
-To keep yourself updated on a branch, do:
+To checkout a specific branch, for example 4.4, do:
 
-    $ git pull <origin> <branch>
-
-For example, for master:
-
-    $ git pull origin master
+    $ git fetch origin
+    $ git checkout -b 4.4 origin/4.4
 
 ## Building
 
@@ -96,23 +57,6 @@ Clean and build:
 
     $ mvn clean install -P systemvm,developer
 
-CloudStack supports several plugins that depend on libraries with distribution restrictions. 
-Because of this they are not included in the default build. Enable these additional plugins 
-activate their respective profiles. For convenience adding -Dnoredist will enable all plugins
-that depend on libraries with distribution restrictions. The build procedure expects that the 
-required libraries are present in the maven repository. 
-
-The following procedure can be used to add the libraries to the local maven repository. Details 
-on obtaining the required libraries can be found in this file. Note that this will vary between
-releases of cloudstack
-
-    $ cd deps
-    $ ./install-non-oss.sh
-
-To build all non redistributable components, add the noredist flag to the build command:
-
-    $ mvn clean install -P systemvm,developer -Dnoredist
-
 Clear old database (if any) and deploy the database schema:
 
     $ mvn -P developer -pl developer -Ddeploydb
@@ -131,101 +75,74 @@ Open the following URL on your browser to access the Management Server UI:
 
     http://localhost:8080/client/
 
-Or,
-
-    http://management-server-ip-address:8080/client
-
 The default credentials are; user: admin, password: password and the domain
 field should be left blank which is defaulted to the ROOT domain.
 
-If you want to contribute your changes, send your [git formatted patch](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git) to:
-https://reviews.apache.org/groups/cloudstack or contact on the developer mailing list.
+## Building with non-redistributable plugins
 
-## Packaging and Installation
+CloudStack supports several plugins that depend on libraries with distribution restrictions. 
+Because of this they are not included in the default build. Enable these additional plugins 
+activate their respective profiles. For convenience adding -Dnoredist will enable all plugins
+that depend on libraries with distribution restrictions. The build procedure expects that the 
+required libraries are present in the maven repository. 
 
-Before packaging, please make sure you go through the "Building" section above.
-This section describes packaging and installation.
+The following procedure can be used to add the libraries to the local maven repository. Details 
+on obtaining the required libraries can be found in this file. Note that this will vary between
+releases of CloudStack
 
-### Debian/Ubuntu
+    $ cd deps
+    $ ./install-non-oss.sh
 
-To create debs:
+To build all non redistributable components, add the noredist flag to the build command:
 
-    $ mvn -P deps # -D noredist, for noredist as described in the "Building" section above
-    $ dpkg-buildpackage
+    $ mvn clean install -P systemvm,developer -Dnoredist
 
-All the deb packages will be created in ../$PWD
+## Packaging and Installation
 
-To create an apt repo: (assuming appropriate user privileges)
+Before packaging, please make sure you go through the "Building" section above. This section describes packaging and installation.
 
-    $ path=/path/to/your/webserver/cloudstack
-    $ mv ../*.deb $path
-    $ dpkg-scanpackages $path /dev/null | gzip -9c > $path/Packages.gz
+### Debian/Ubuntu
 
-Configure your system to use your new apt repo:
+To create debs install the following extra packages:
 
-    $ echo "deb $path ./" >> /etc/apt/sources.list.d/cloudstack.list
+    #apt-get -y install python-mysqldb
+    #apt-get -y install debhelper
+    #apt-get -y install tomcat6
 
-Installation:
+Then:
 
-Install needed packages, apt-get upgrade for upgrading:
+    $ mvn -P deps # -D noredist, for noredist as described in the "Building" section above
+    $ dpkg-buildpackage -uc -us
 
-    $ apt-get update
-    $ apt-get install cloud-client                   # management server
-    $ apt-get install mysql-server                   # mysql server
-    $ apt-get install cloud-agent cloud-system-iso   # agent (kvm)
-    $ apt-get install cloud-awsapi                   # awsapi server
-    $ apt-get install cloud-usage                    # usage server
+All the deb packages will be located one level down.
 
 ### RHEL/CentOS
 
-To create rpms:
-
-    $ cd packaging/centos63
-    $ bash packaging.sh [ -p NOREDIST ]
-
-All the rpm packages will be create in dist/rpmbuild/RPMS/x86_64
+To create rpms, install the following extra packages:
 
-To create a yum repo: (assuming appropriate user privileges)
+    #yum -y install rpm-build
+    #yum -y install tomcat6
+    #yum -y install ws-commons-util
+    #yum -y instal gcc
+    #yum -y install glibc-devel
+    #yum -y install MySQL-python
 
-    $ path=/path/to/your/webserver/cloudstack
-    $ cd dist/rpmbuild/RPMS/x86_64
-    $ mv *.rpm $path
-    $ createrepo $path
+Then:
 
-Configure your system to use your new yum repo, add the following to /etc/yum.repos.d/cloudstack.repo:
-
-    [apache-cloudstack]
-    name=Apache CloudStack
-    baseurl=http://webserver.tld/path/to/repo
-    enabled=1
-    gpgcheck=0
-
-Installation:
-
-Install needed packages:
-
-    $ yum update
-    $ yum install cloudstack-management                       # management server
-    $ yum install mysql-server                       # mysql server
-    $ yum install cloudstack-agent                        # agent (kvm)
-    $ yum install cloudstack-usage                        # usage server
-
-## Installing CloudMonkey CLI
-
-CloudMonkey is a CLI for Apache CloudStack. It was earlier in `tools/cli` within
-the source code but now it has its own repository:
+    $ cd packaging/centos63
+    $ package.sh
 
-    https://git-wip-us.apache.org/repos/asf?p=cloudstack-cloudmonkey.git
+To create packages for noredist add the `-p noredist` option to the package script.
+All the rpm packages will be created in `dist/rpmbuild/RPMS/x86_64` directory.
 
 ## Notes
 
 If you will be using Xen as your hypervisor, please download [vhd-util](http://download.cloud.com.s3.amazonaws.com/tools/vhd-util)
 
 If management server is installed on RHEL/CentOS, then copy vhd-util into:
-/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/
+
+    /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/
 
 If management server is installed on Ubuntu, then put vhd-util into:
-/usr/lib/cloud/common/scripts/vm/hypervisor/xenserver/vhd-util
 
-Once, you've successfully installed Apache CloudStack you may read the user manuals
-and guides which contains technical documentation for Apache CloudStack.
+    /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver/vhd-util

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index cce22ae..ac077f9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Apache CloudStack
 
+![Apache CloudStack](tools/logo/apache_cloudstack.png)
+
 Apache CloudStack is open source software designed to deploy and manage large
 networks of virtual machines, as a highly available, highly scalable
 Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used
@@ -13,36 +15,77 @@ Network-as-a-Service, user and account management, a full and open native API,
 resource accounting, and a first-class User Interface (UI).
 
 CloudStack currently supports the most popular hypervisors:
-VMware, KVM, XenServer, Xen Cloud Platform (XCP) and Hyper-V.
+VMware vSphere, KVM, XenServer, XenProject and Hyper-V as well as LXC containers.
 
 Users can manage their cloud with an easy to use Web interface, command line
-tools, and/or a full-featured RESTful API. In addition, CloudStack provides an
-API that's compatible with AWS EC2 and S3 for organizations that wish to deploy
-hybrid clouds.
+tools, and/or a full-featured query based API.
 
-For more information on Apache CloudStack, please visit:
-http://cloudstack.apache.org
+For more information on Apache CloudStack, please visit the [website](http://cloudstack.apache.org)
 
 ## Who Uses CloudStack?
 
-There are more than 150 known organisations using Apache CloudStack (or a
-commercial distribution of CloudStack). Our users include many major service
-providers running CloudStack to offer public cloud services, product vendors who
-incorporate or integrate with Cloudstack in their own products, organisations
-who have used Cloudstack to build their own private clouds, and systems
-integrators that offer CloudStack related services.
+* There are more than 150 known organizations using Apache CloudStack (or a commercial distribution of CloudStack). Our users include many major service providers running CloudStack to offer public cloud services, product vendors who incorporate or integrate with CloudStack in their own products, organizations who have used CloudStack to build their own private clouds, and systems integrators that offer CloudStack related services.
+
+* See our [case studies](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies) highlighting successful deployments of Apache CloudStack.
+
+* See the up-to-date list of current [users](http://cloudstack.apache.org/users.html).
+
+* If you are using CloudStack in your organization and your company is not listed above, please complete our brief adoption [survey](http://cloudstack.apache.org/survey.html). We're happy to keep your company name anonymous if you require.
+
+## Getting Started
+
+* Download a released [version](http://cloudstack.apache.org/downloads.html)
+* Build from source with the instructions in the [INSTALL.md](INSTALL.md) file.
+
+## Links
+
+* [Documentation](http://docs.cloudstack.apache.org)
+* Developer [wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home)
+* [Release notes](http://docs.cloudstack.apache.org/projects/cloudstack-release-notes)
+* Design [documents](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design)
+* API [documentation](http://cloudstack.apache.org/docs/api)
+
+## Getting Involved and Contributing
+
+Interested in helping out with Apache CloudStack? Great! We welcome
+participation from anybody willing to work [The Apache Way](http://theapacheway.com) and make a
+contribution. Note that you do not have to be a developer in order to contribute
+to Apache CloudStack. We need folks to help with documentation, translation,
+promotion etc.See our contribution [page](http://cloudstack.apache.org/contribute.html).
+
+If you're interested in learning more or participating in the Apache CloudStack
+project, the mailing lists are the best way to do that. While the project has
+several communications channels, the [mailing lists](http://cloudstack.apache.org/mailing-lists.html) are the most active and the
+official channels for making decisions about the project itself.
+
+Mailing lists:
+- [Development Mailing List](mailto:dev-subscribe@cloudstack.apache.org)
+- [Users Mailing List](mailto:users-subscribe@cloudstack.apache.org)
+- [Commits Mailing List](mailto:commits-subscribe@cloudstack.apache.org)
+- [Issues Mailing List](mailto:issues-subscribe@cloudstack.apache.org)
+- [Marketing Mailing List](mailto:marketing-subscribe@cloudstack.apache.org)
+
+IRC, join us on irc.freenode.net on:
+- `#cloudstack`: General Apache CloudStack conversation and end user support
+- `#cloudstack-dev`: Development discussions
+
+Report and/or check bugs on [JIRA](https://issues.apache.org/jira/browse/CLOUDSTACK) and check our
+developer [page](http://cloudstack.apache.org/developers.html) for contributing code.
+
+## News and Events
 
-For case studies highlighting successful deployments of Apache CloudStack, please
-visit: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies
+* [Blog](https://blogs.apache.org/cloudstack)
+* [Twitter](https://twitter.com/cloudstack)
+* [Planet CloudStack](http://planet.apache.org/cloudstack)
+* [Events and meetup](http://lanyrd.com/topics/apache-cloudstack)
 
-For the up-to-date list of current users, please visit:
-http://cloudstack.apache.org/users.html
+## Reporting Security Vulnerabilities
 
-If you are using CloudStack in your organisation and your company isn't listed
-above, please complete our brief adoption survey. We're happy to keep your
-company name anonymous if you require.
+If you've found an issue that you believe is a security vulnerability in a
+released version of CloudStack, please report it to `security@cloudstack.apache.org` with details about the vulnerability, how it
+might be exploited, and any additional information that might be useful.
 
-CloudStack survey page: http://cloudstack.apache.org/survey.html
+For more details, please visit our security [page](http://cloudstack.apache.org/security.html)
 
 ## License
 
@@ -85,111 +128,9 @@ Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Sec
 
 The following provides more details on the included cryptographic software:
 
-  CloudStack makes use of JaSypt cryptographic libraries
-
-  CloudStack has a system requirement of MySQL, and uses native database encryption
-  functionality.
-
-  CloudStack makes use of the Bouncy Castle general-purpose encryption library.
-
-  CloudStack can optionally interacts with and controls OpenSwan-based VPNs.
-
-  CloudStack has a dependency on Apache WSS4J as part of the AWSAPI implementation.
-
-  CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation.
-
-## Downloading
-
-You can download released versions from: http://cloudstack.apache.org/downloads.html
-
-## Building
-
-Please see the [INSTALL.md](INSTALL.md) file included in the root directory of the source tree.
-
-## Tooling
-
-Please see the [README.tools.md](README.tools.md) file included in the root directory of the source tree.
-
-## Documentation
-
-Project wiki:
-https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home
-
-Getting started documentation:
-http://docs.cloudstack.apache.org/en/master
-
-Installation documentation:
-http://docs.cloudstack.apache.org/projects/cloudstack-installation
-
-Administration documentation:
-http://docs.cloudstack.apache.org/projects/cloudstack-administration
-
-Latest release notes:
-http://docs.cloudstack.apache.org/projects/cloudstack-release-notes
-
-Design documents:
-https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design
-
-API documentation:
-http://cloudstack.apache.org/docs/api
-
-## Getting Involved and Contributing
-
-Interested in helping out with Apache CloudStack? Great! We welcome
-participation from anybody willing to work The Apache Way and make a
-contribution. Note that you do not have to be a developer in order to contribute
-to Apache CloudStack. We need folks to help with documentation, translation,
-promotion etc.
-
-If you're interested in learning more or participating in the Apache CloudStack
-project, the mailing lists are the best way to do that. While the project has
-several communications channels, the mailing lists are the most active and the
-official channels for making decisions about the project itself.
-
-Mailing lists:
-- [Development Mailing List](mailto:dev-subscribe@cloudstack.apache.org)
-- [Users Mailing List](mailto:users-subscribe@cloudstack.apache.org)
-- [Commits Mailing List](mailto:commits-subscribe@cloudstack.apache.org)
-- [Issues Mailing List](mailto:issues-subscribe@cloudstack.apache.org)
-- [Marketing Mailing List](mailto:marketing-subscribe@cloudstack.apache.org)
-
-For more details on mailing lists subscription and usage, please visit:
-http://cloudstack.apache.org/mailing-lists.html
-
-IRC, join us on irc.freenode.net on:
-- `#cloudstack`: General Apache CloudStack conversation and end user support
-- `#cloudstack-dev`: Development discussions
-- `#cloudstack-meeting`: Weekly and ad-hoc meeting room for the CloudStack community
-
-Bug reporting:
-https://issues.apache.org/jira/browse/CLOUDSTACK
-
-Developer resources:
-http://cloudstack.apache.org/developers.html
-
-Please see our contributing page for more details:
-http://cloudstack.apache.org/contribute.html
-
-## News and Events
-
-Blog:
-https://blogs.apache.org/cloudstack
-
-Twitter:
-https://twitter.com/cloudstack
-
-Planet CloudStack:
-http://planet.apache.org/cloudstack
-
-Events and meetup:
-http://lanyrd.com/topics/apache-cloudstack
-
-## Reporting Security Vulnerabilities
-
-If you've found an issue that you believe is a security vulnerability in a
-released version of CloudStack, please report it to
-`security@cloudstack.apache.org` with details about the vulnerability, how it
-might be exploited, and any additional information that might be useful.
-
-For more details, please visit: http://cloudstack.apache.org/security.html
-
+* CloudStack makes use of JaSypt cryptographic libraries
+* CloudStack has a system requirement of MySQL, and uses native database encryption functionality.
+* CloudStack makes use of the Bouncy Castle general-purpose encryption library.
+* CloudStack can optionally interacts with and controls OpenSwan-based VPNs.
+* CloudStack has a dependency on Apache WSS4J as part of the AWSAPI implementation.
+* CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/README.tools.md
----------------------------------------------------------------------
diff --git a/README.tools.md b/README.tools.md
deleted file mode 100644
index 069c342..0000000
--- a/README.tools.md
+++ /dev/null
@@ -1,260 +0,0 @@
-> Licensed to the Apache Software Foundation (ASF) under one
-> or more contributor license agreements.  See the NOTICE file
-> distributed with this work for additional information
-> regarding copyright ownership.  The ASF licenses this file
-> to you under the Apache License, Version 2.0 (the
-> "License"); you may not use this file except in compliance
-> with the License.  You may obtain a copy of the License at
-> 
->   http://www.apache.org/licenses/LICENSE-2.0
-> 
-> Unless required by applicable law or agreed to in writing,
-> software distributed under the License is distributed on an
-> "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-> KIND, either express or implied.  See the License for the
-> specific language governing permissions and limitations
-> under the License.
-
-
----------------------------------------------------------------------------
-This README describes the various tools available with Apache Cloudstack -
-for compiling, deploying, building and testing the project
----------------------------------------------------------------------------
-
-DevCloud
-=========================================================
-Under tools/devcloud
-
-NOTE - DevCloud (tools/devcloud) is a work in progress.  The project has not
-determined how to best establish a nightly DevCloud build process, or how to
-distribute the image. 
-
-#### Contents: ####
-
-Under tools/devcloud are various scripts used to build the devcloud image.
-devcloudsetup.sh - the origional devcloud build script (assumes an Ubuntu 12.04
-VM image)
-
-        $ cd tools/devcloud
-
-* build_vagrant_basebox.sh - a script that uses VirtualBox, VeeWee, Vagrant
-(patched) and puppet to create a devcloud basebox
-* veewee - configuration files used to build a basic Ubuntu 12.04 vagrant box
-via VeeWee
-* basebuild - The Vagrantfile and puppet module that gets applied to the basic
-Ubuntu 12.04 box
-* devcloudbox - The Vagrantfile and puppet module that is used with the
-[hopefully] distributed devcloud base box
-
-#### Instructions: ####
-
-To build a "devcloud base box", run you need a system with VirtualBox and rvm
-installed (use ruby 1.9.2).  Run build_vagrant_basebox.sh to build the base
-box.
-
-To use the "devcloud base box" that is created in the previous step, you need
-to have installed a forked version of Vagrant (until we make the changes
-plugins instead of direct source patches) that can be found here:
-
-Once installed per the Vagrant installation process, run:
-
-        $ vagrant box add devcloud [path to devcloud.box]
-
-Then, either go into the devcloudbox folder of your checked out version of the
-CloudStack code (cloudstack/tools/devcloud/devcloudbox), or copy the
-contents of that folder to another location.
-
-Assuming the patched Vagrant installation is working, you then
-simply run "vagrant up" from within that directory.
-
-#### Installation ####
-
-Install DevCloud Base system:
-
-1. get code from https://github.com/jedi4ever/veewee, and install
-2. veewee vbox define devcloud ubuntu-12.04-server-i386
-3. put these two files(definition.rb and preseed.cfg) under ./definition/devcloud/
-3. veewee vbox build devcloud
-
-
-Marvin
-=========================================================
-Under tools/marvin
-
-Marvin is the functional testing framework for CloudStack written in python.
-Writing of unittests and functional tests with Marvin makes testing with
-cloudstack easier 
-
-Visit the
-[wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python)
-for the most updated information
-
-#### Dependencies ####
-Marvin will require the following dependencies, these will be automatically
-downloaded from the python cheeseshop when you install Marvin.
-
-- mysql-connector-python, 
-- paramiko,
-- nose,
-- unittest-xml-reporting,
-
-#### Installation ####
-
-        $ untar Marvin-0.1.0.tar.gz 
-        $ cd Marvin-0.1.0
-        $ python setup.py install
-
-#### Features ####
-
-1. very handy cloudstack API python wrapper
-2. support async job executing in parallel
-3. remote ssh login/execute command
-4. mysql query 
-
-#### Examples ####
-
-Examples on how to develop your own configuration can be found in the marvin sandbox.
-Under tools/marvin/marvin/sandbox
-
-To generate the config for a deployment. Alter the .properties file in the sandbox. For example the
-simualtordemo.properties after modification can generate the config file as
-shown below
-
-        $ python simulator_setup.py -i simulatordemo.properties -o simulatordemo.cfg
-
-To deploy the environment and run the tests
-
-        $ python -m marvin.deployAndRun -c simulatordemo.cfg -t /tmp/t.log -r /tmp/r.log -d testcase
-
-#### Tests #### 
-
-Functional Tests written using marvin can be found under test/integration
-folder. These are tests that are written to be run against a live deployed
-system.
-
-To run the tests - you should have marvin installed and correctly importable.
-The tests are long running and are best monitored by external hudson jobs.
-
-Also you will have to point marvin to the right configuration file that has
-details about your cloudstack deployment. For more help on how to write the
-config file and run tests check the tutorial at :
-
-[] (https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python)
-
-#### Build Verification Testing (BVT) ####
-
-These test cases are the core functionality tests that ensure the application
-is stable and can be tested thoroughly.  These BVT cases definitions are
-located at :
-[] (https://docs.google.com/a/cloud.com/spreadsheet/ccc?key=0Ak8acbfxQG8ndEppOGZSLV9mUF9idjVkTkZkajhTZkE&invite=CPij0K0L)
-
-##### Guidelines on tests #####
-
-BVT test cases are being developed using Python unittests2. Following are
-certain guidelines being followed
-
-1. Tests exercised for the same resource should ideally be present under a
-single suite or file.
-
-2. Time-consuming operations that create new cloud resources like server
-creation, volume creation etc should not necessarily be exercised per unit
-test. The resources can be shared by creating them at the class-level using
-setUpClass and shared across all instances during a single run.
-
-3. Certain tests pertaining to NAT, Firewall and Load Balancing warrant fresh
-resources per test. Hence a call should be taken by the stakeholders regarding
-sharing resources.
-
-4. Ensure that the tearDown/tearDownClass functions clean up all the resources
-created during the test run.  
-
-For more information about unittests: [] (http://docs.python.org/library/unittest.html)
-
-##### BVT Tests #####
-Under test/integration/smoke
-
-The following files contain these BVT cases:
-
-1. test_vm_life_cycle.py - VM Life Cycle tests
-2. test_volumes.py - Volumes related tests
-3. test_snapshots.py - Snapshots related tests
-4. test_disk_offerings.py - Disk Offerings related tests
-5. test_service_offerings.py - Service Offerings related tests
-6. test_hosts.py - Hosts and Clusters related tests
-7. test_iso.py - ISO related tests
-8. test_network.py - Network related tests
-9. test_primary_storage.py - Primary storage related tests
-10. test_secondary_storage.py - Secondary storage related tests
-11. test_ssvm.py - SSVM & CPVM related tests
-12. test_templates.py - Templates related tests
-13. test_routers.py - Router related tests
-
-
-##### P1 Tests #####
-Under test/integration/component
-
-These test cases are the core functionality tests that ensure the application
-is stable and can be tested thoroughly.  These P1 cases definitions are located
-at :
-[] (https://docs.google.com/a/clogeny.com/spreadsheet/ccc?key=0Aq5M2ldK6eyedDJBa0EzM0RPNmdVNVZOWnFnOVJJcHc&hl=en_US)
-
-The following files contain these P1 cases:
-
-1. test_snapshots.py - Snapshots related tests
-2. test_routers.py - Router related tests
-3. test_usage.py - Usage realted tests
-4. test_account.py - Account related tests
-5. test_resource_limits.py - Resource limits tests
-6. test_security_groups.py - Security groups related tests
-7. test_templates.py - templates related tests
-8. test_volumes.py - Volumes related tests
-9. test_blocker_bugs.py - Blocker bugs tests
-10. test_project_configs.py - Project global configuration related tests
-11. test_project_limits.py - Project resource limits related tests
-12. test_project_resources.py - Project resource creation related tests
-13. test_project_usage.py - Project usage related tests
-14. test_projects - Projects functionality tests
-
-Marvin Sandbox
-=========================================================
-In: tools/marvin/marvin/sandbox
-
-In here you should find a few common deployment models of CloudStack that you
-can configure with properties files to suit your own deployment. One deployment
-model for each of - advanced zone, basic zone and a simulator demo are given.  
-
-$ ls -
-basic/
-advanced/
-simulator/
-
-Each property file is divided into logical sections and should be familiar to
-those who have deployed CloudStack before. Once you have your properties file
-you will have to create a JSON configuration of your deployment using the
-python script provided in the respective folder.
-
-The demo files are from the tutorial for testing with python that can be found at
-   https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python
-
-A common deployment model of a simulator.cfg that can be used for debugging is
-included. This will configure an advanced zone with simulators that can be used
-for debugging purposes when you do not have hardware to debug with.
-
-To do this:
-$ cd cloudstack-oss/
-$ ant run-simulator #This will start up the mgmt server with the simulator seeded
-
-## In another shell
-$ ant run-simulator
-
-test/conf - EC2 script
-=========================================================
-
-To run submitCertEC2 and deleteCertEC2 scripts, update parameters in conf/tool.properties file:
-
-* host - ip address of the host where cloud-bridge software is installed
-* port - port cloud-bridge software is listening to
-* accesspoint - access point for cloud-bridge REST request
-* version - Amazon EC2 api version supported by cloud-bridge
-* signaturemethod - HmacSHA1 or HmacSHA256
-* expires - the date when certificate expires

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f00b35..c965436 100644
--- a/pom.xml
+++ b/pom.xml
@@ -702,7 +702,7 @@
             <numUnapprovedLicenses>0</numUnapprovedLicenses>
             <excludeSubProjects>false</excludeSubProjects>
             <excludes>
-              <exclude>CHANGES</exclude>
+              <exclude>CHANGES.md</exclude>
               <exclude>README.md</exclude>
               <exclude>INSTALL.md</exclude>
               <exclude>.idea/</exclude>
@@ -819,6 +819,7 @@
               <exclude>systemvm/patches/debian/config/var/www/html/latest/.htaccess</exclude>
               <exclude>systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
               <exclude>tools/transifex/.tx/config</exclude>
+              <exclude>tools/logo/apache_cloudstack.png</exclude>
               <exclude>tools/marvin/marvin/sandbox/advanced/sandbox.cfg</exclude>
               <exclude>tools/ngui/static/bootstrap/*</exclude>
               <exclude>tools/ngui/static/js/lib/*</exclude>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/tools/logo/apache_cloudstack.png
----------------------------------------------------------------------
diff --git a/tools/logo/apache_cloudstack.png b/tools/logo/apache_cloudstack.png
new file mode 100644
index 0000000..d0fde45
Binary files /dev/null and b/tools/logo/apache_cloudstack.png differ


[07/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
CLOUDSTACK-6223. removeNicFromVirtualMachine fails if another instance in another domain has a nic with the same ip and a forwarding rule configured on it

Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit e9af5f44ae080da3f191cba57b55747801c3100e)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/213bdbde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/213bdbde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/213bdbde

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 213bdbde35e273b2c40d421071e46f2af6de729c
Parents: aa81823
Author: Upendra Moturi <up...@sungard.com>
Authored: Tue Apr 1 18:26:44 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Sep 12 12:07:04 2014 +0200

----------------------------------------------------------------------
 .../com/cloud/network/rules/dao/PortForwardingRulesDao.java  | 2 ++
 .../cloud/network/rules/dao/PortForwardingRulesDaoImpl.java  | 8 ++++++++
 server/src/com/cloud/network/rules/RulesManagerImpl.java     | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/213bdbde/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
index 4694cb9..5b0e748 100644
--- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
+++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
@@ -44,5 +44,7 @@ public interface PortForwardingRulesDao extends GenericDao<PortForwardingRuleVO,
 
     List<PortForwardingRuleVO> listByDestIpAddr(String ip4Address);
 
+    List<PortForwardingRuleVO> listByVmidAndDestIpAddr(String ip4Address,long vmid);
+
     PortForwardingRuleVO findByIdAndIp(long id, String secondaryIp);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/213bdbde/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
index 45c0aeb..6bc401b 100644
--- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
@@ -158,6 +158,14 @@ public class PortForwardingRulesDaoImpl extends GenericDaoBase<PortForwardingRul
     }
 
     @Override
+    public List<PortForwardingRuleVO> listByVmidAndDestIpAddr(String ip4Address,long vmid) {
+        SearchCriteria<PortForwardingRuleVO> sc = AllFieldsSearch.create();
+        sc.setParameters("dstIp", ip4Address);
+        sc.setParameters("vmId", vmid);
+        return listBy(sc);
+    }
+
+    @Override
     public PortForwardingRuleVO findByIdAndIp(long id, String secondaryIp) {
         SearchCriteria<PortForwardingRuleVO> sc = AllFieldsSearch.create();
         sc.setParameters("id", id);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/213bdbde/server/src/com/cloud/network/rules/RulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index eea1262..59025f2 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -1465,7 +1465,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
     public List<FirewallRuleVO> listAssociatedRulesForGuestNic(Nic nic) {
         List<FirewallRuleVO> result = new ArrayList<FirewallRuleVO>();
         // add PF rules
-        result.addAll(_portForwardingDao.listByDestIpAddr(nic.getIp4Address()));
+        result.addAll(_portForwardingDao.listByVmidAndDestIpAddr(nic.getIp4Address(),nic.getInstanceId()));
         // add static NAT rules
         List<FirewallRuleVO> staticNatRules = _firewallDao.listStaticNatByVmId(nic.getInstanceId());
         for (FirewallRuleVO rule : staticNatRules) {


[12/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
Cleaning the README, INSTALL and CHANGES file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/528ac4c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/528ac4c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/528ac4c6

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 528ac4c6e913b3e39b376965e744714e8496c4be
Parents: 0066b77
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Sep 15 06:27:17 2014 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Tue Sep 16 06:08:50 2014 -0400

----------------------------------------------------------------------
 CHANGES                          | 417 ------------------
 CHANGES.md                       | 784 ++++++++++++++++++++++++++++++++++
 INSTALL.md                       | 215 +++-------
 README.md                        | 197 +++------
 README.tools.md                  | 260 -----------
 pom.xml                          |   3 +-
 tools/logo/apache_cloudstack.png | Bin 0 -> 155790 bytes
 7 files changed, 921 insertions(+), 955 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
deleted file mode 100644
index e3e316e..0000000
--- a/CHANGES
+++ /dev/null
@@ -1,417 +0,0 @@
-
-Apache CloudStack CHANGES
-======================================
-
-Full release notes for each release are located in the project's documentation website:  
-http://cloudstack.apache.org/docs
-
-Version 4.2.0
-------------------------
-
-In progress
-
-
-
-
-Version 4.1.0
-------------------------
-
-This is the second major release of CloudStack from within the Apache Software Foundation, and the
-first major release as a Top-Level Project (TLP). 
-
-Build Tool Changes:
-
- * The project now uses Maven 3 exclusively to build. 
-
-New Features:
-* CLOUDSTACK-101: OVS support in KVM
-* CLOUDSTACK-132: Mash up marvin into an interactive auto-completing API shell for CloudStack
-* CLOUDSTACK-241: AWS Style Regions
-* CLOUDSTACK-297: Reset SSH Key to access VM (similar to reset password)
-* CLOUDSTACK-299: Egress firewall rules for guest network
-* CLOUDSTACK-306: Support SRX & F5 inline mode
-* CLOUDSTACK-618: API request throttling to avoid malicious attacks on MS per account through frequent API request.
-* CLOUDSTACK-637: AutoScale
-* CLOUDSTACK-644: Resize volumes feature
-* CLOUDSTACK-706: Persistent Networks without running a VM
-* CLOUDSTACK-726: Implement L3 Router functionality in Nicira Nvp Plugin
-* CLOUDSTACK-780: Additional VMX Settings
-* CLOUDSTACK-926: ApiDiscoverService: Implement a plugin mechanism that exposes the list of APIs through a discovery service on the management server
-
-Bug Fixes:
-
-* CLOUDSTACK-1600 Typo in dpkg-buildpackage command
-* CLOUDSTACK-1574 updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type
-* CLOUDSTACK-1562 Replace the short-cut solution of supportting @DB with the formal one
-* CLOUDSTACK-1541 NPE while deleting snapshot :Unexpected exception while executing org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd
-* CLOUDSTACK-1521 Redundant router: Services are not stopped when switch to BACKUP state
-* CLOUDSTACK-1509 Failed to implement network elements and resources while provisioning for persistent network(createVlanIpRange to an account]
-* CLOUDSTACK-1496 List API Performance: listAccounts failing with OOME for high values of pagesize (>1000 )
-* CLOUDSTACK-1487 cloudstack-setup-agent fails to set private.network.device on KVM host add
-* CLOUDSTACK-1485 Add Baremetal Provider back to 4.1 branch
-* CLOUDSTACK-1484 "API Throttling : api.throttling.enabled, Global setting missing"
-* CLOUDSTACK-1473 deleteDomain is failing with NPE
-* CLOUDSTACK-1470 unhandled exception executing api command: deployVirtualMachine
-* CLOUDSTACK-1469 kvm agent: agent service fails to start up
-* CLOUDSTACK-1465 List Zones returns null under create instance when logged is as user
-* CLOUDSTACK-1449 listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned
-* CLOUDSTACK-1447 [UI]Persistent Status is not displayed for VPC Tiers
-* CLOUDSTACK-1436 4.1 management server fails to start from RPM build artifacts
-* CLOUDSTACK-1429 single account is unable to use same vnet across multiple physical networks
-* CLOUDSTACK-1425 unhandled exception executing api command: migrateVirtualMachine & recoverVirtualMachine
-* CLOUDSTACK-1420 Ensure trademarks are properly attributed in publican brand.
-* CLOUDSTACK-1419 Apache-ify and apply trademark logos in the UI
-* CLOUDSTACK-1418 "As regular user , we are not allowed to deploy VM on a shared network."
-* CLOUDSTACK-1417 "When invalid values are passed to createNetwork() , error message does not indicate the parameter name that has invalid values."
-* CLOUDSTACK-1414 Redundant router: BACKUP switch cancelled due to lock timeout after a glitch in network
-* CLOUDSTACK-1403 Storage and console-proxy related error
-* CLOUDSTACK-1402 listRouters API response doesn't return linklocal IP and public IP details
-* CLOUDSTACK-1399 Unhandled exception executing api command: stopVirtualMachine
-* CLOUDSTACK-1397 Static Nat configuration is failing with NPE
-* CLOUDSTACK-1391 EventBus is not getting injected after javelin merge
-* CLOUDSTACK-1383 Deploying basic zone on 4.1 fails in NPE
-* CLOUDSTACK-1382 "vm deploy fails with Error ""cannot find DeployPlannerSelector for vm"""
-* CLOUDSTACK-1375 deploydb failing with acs master
-* CLOUDSTACK-1369 "Ipv6 - In dual Stack network , guest VM does not have the Ipv6 address of the router programmed in /etc/resolv.conf for DNS resolution."
-* CLOUDSTACK-1367 NPE noticed in logs while AgentMonitor is monitoring the host ping interval
-* CLOUDSTACK-1357 "Autoscale: Provisioned VMs from Netscaler not being added to lb vserver, provserver fails with provserver_err_asynctaskpoll"
-* CLOUDSTACK-1350 Management server Stop and start causes previously downloaded ISOs and templates to redownload & reinstall
-* CLOUDSTACK-1347 "Not able to delete network. Error - ""Unable to insert queue item into database, DB is full?"""
-* CLOUDSTACK-1346 "Check to see if external devices are used in the network, is hardcoded for specific devices"
-* CLOUDSTACK-1345 BigSwitch plugin introduces 'VNS' isolation in UI without backend implementation
-* CLOUDSTACK-1344 Typo in use.external.dns setting description
-* CLOUDSTACK-1343 Porting Baremetal related UI changes to ACS
-* CLOUDSTACK-1341 URL for the KEYs file is wrong in the installation guide
-* CLOUDSTACK-1339 ASF 4.1: Management server becomes unresponsive
-* CLOUDSTACK-1338 Deploy VM failed using ISO
-* CLOUDSTACK-1334 vmware.root.disk.controller doesn't work.
-* CLOUDSTACK-1332 IPV6 - Router and guest Vms should be able to use an IPV6 address for external DNS entry.
-* CLOUDSTACK-1331 Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
-* CLOUDSTACK-1330 ec2-run-instances - When -n option is used to deploy multiple Vms API returns error even though few of the Vms have been deployed successfully.
-* CLOUDSTACK-1320 Routers naming convention is changed to hostname
-* CLOUDSTACK-1319 createCustomerVpnGateway response gives TypeError: json.createvpncustomergatewayresponse is undefined
-* CLOUDSTACK-1315 [F5-SRX-InlineMode] Network implement failed with Run time Exception during network upgrade from VR to SRX-F5
-* CLOUDSTACK-1313 Working with Volumes Section Is Missing
-* CLOUDSTACK-1312 "Fix rolling upgrades from 4.0 to 4.1 in 4.1 release, fix db schemas to be same as 4.0"
-* CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup
-* CLOUDSTACK-1303 Ipv6 - java.lang.NullPointerException when executing listnetworks() and deployVirtualMachine() after extending the Ipv4 range of a dual stack network.
-* CLOUDSTACK-1300 section in wrong order in installation guide
-* CLOUDSTACK-1299 Errors in 4.5.5 section of installation guide
-* CLOUDSTACK-1295 NPE in usage parsers due to missing @Component inject
-* CLOUDSTACK-1289 [F5-SRX-InlineMode] Usage stats are not generated for Juniper SRX Firewall in inlinemode
-* CLOUDSTACK-1288 [F5-SRX-InlineMode] classCastException during network restart with cleanup option true
-* CLOUDSTACK-1277 ApiResponseHelper.createUserVmResponse failed to populate password field set from UserVm object
-* CLOUDSTACK-1272 Autoscale: createAutoScaleVmProfile fails due to unable to retrieve Service Offering id
-* CLOUDSTACK-1267 KVM's cloudstack-agent service doesn't log (log4j)
-* CLOUDSTACK-1265 logrotate dnsmasq configuration is wrong
-* CLOUDSTACK-1262 "Failed to Prepare Secondary Storage in VMware,"
-* CLOUDSTACK-1251 Baremetal zone doesn't need primary/secondary storage in UI wizard
-* CLOUDSTACK-1243 Failed to cleanup account :java.lang.NullPointerException
-* CLOUDSTACK-1242 [F5-SRX-InlineMode] Failed to create LB rule with F5-SRX inlinemode deployement
-* CLOUDSTACK-1241 Network apply rules logic is broken
-* CLOUDSTACK-1237 "Register Template fails with ""Cannot find template adapter for XenServer"""
-* CLOUDSTACK-1234 Unable to start KVM agent with 4.1 build
-* CLOUDSTACK-1233 Veewee configuration files are inappropriately identified as ASLv2 licensed files
-* CLOUDSTACK-1232 "Ipv6 - Guest Vms are not able to get Ipaddress when executing dhclient command when using ""/96"" network."
-* CLOUDSTACK-1226 Error while running Cloudstack-setup-databases
-* CLOUDSTACK-1223 Exception while starting jetty server: org.springframework.beans.factory.BeanCreationException Error creating bean with name 'apiServer':
-* CLOUDSTACK-1222 API rate limit configs: removed double quote in upgrade script
-* CLOUDSTACK-1220 Ipv6 - Better error message when deploy Vm fails to get a free Ip address.
-* CLOUDSTACK-1219 Ipv6 - Provide better error messages when deploying a Vm with Ip an address that is outside the network's ip range / if the ip address already is assigned to another Vm.
-* CLOUDSTACK-1216 UUID is null for admin and failed to register user key with 4.1
-* CLOUDSTACK-1210 Make all pluggable services return list of api cmd classes
-* CLOUDSTACK-1206 Failure in Copy of System templates
-* CLOUDSTACK-1205 Ipv6 - Ubuntu 12.10 guest Vms looses default route (after it expiration time ~ 30 mts) when ipv6.autoconfig parameters are disabled except for net.ipv6.conf.lo.autoconf which is enabled.
-* CLOUDSTACK-1204 Fail to create advance zone due to fail to add host
-* CLOUDSTACK-1201 "Failed to create ssh key for user ""cloud"" /var/lib/cloud/management/.ssh/id_rsa and failed to start management server"
-* CLOUDSTACK-1190 Make APIChecker interface throw a single sensible exception
-* CLOUDSTACK-1181 mvn deploy db failing with NPE
-* CLOUDSTACK-1176 Issue with snapshots(create/list)
-* CLOUDSTACK-1174 Snapshots related SQL error
-* CLOUDSTACK-1173 ConsoleProxyResource instantiation exception
-* CLOUDSTACK-1168 Create firewall rule broken
-* CLOUDSTACK-1163 Failed with NPE while creating firewall rule
-* CLOUDSTACK-1161 Differences between 4.1 and master in ongoing-config-of-external-firewalls-lb.xml
-* CLOUDSTACK-1154 Account/Users related API failed due to RegionService inject exception
-* CLOUDSTACK-1153 "Ipv6 - Vm deployment fails with ""n must be positive"" error."
-* CLOUDSTACK-1152 Missing tag in host-add.xml
-* CLOUDSTACK-1141 "Ipv6 - After network restart (and reboot router) , we do not see the existing vms dnsentries not being programmed in the router."
-* CLOUDSTACK-1138 "Providing invalid values for gateway, netmask etc in the zoneWizard blocks the VLAN container to load , throwing an error"
-* CLOUDSTACK-1123 ListStoragePools API broken by refactor
-* CLOUDSTACK-1113 "Ipv6 - Not able to deploy a new VM in this network because of ""Unable to allocate Unique Ipv6 address"""
-* CLOUDSTACK-1112 "Errors in ""Prepare the System VM Template"""
-* CLOUDSTACK-1111 Ipv6 - listRouters() does not return guestipaddress/
-* CLOUDSTACK-1109 "Ipv6 - Unable to expunge User Vms that are ""Destroyed""."
-* CLOUDSTACK-1108 Ipv6 - Not able to restart Networks.
-* CLOUDSTACK-1107 Ipv6 - Unable to extend Ip range for a Ipv6 network using craeteVlanIpRange() command - Error code 530 returned.
-* CLOUDSTACK-1105 "IpV6 - listVirtualMachines() does not return netmask ,gateway,ipaddress."
-* CLOUDSTACK-1104 Ipv6 - listVlanIpRanges() returns error 530.
-* CLOUDSTACK-1103 "IpV6 - listNetwork() command does not retrun gateway,netmask,cidr"
-* CLOUDSTACK-1095 Ipv6 - dhclient command needs to be run manually on the Vms to get the Ipv6 address.
-* CLOUDSTACK-1088 EnableStaticNat error will clear the data in database
-* CLOUDSTACK-1087 Update the Developer Guide for ASFCS 4.1 Release
-* CLOUDSTACK-1083 listUsageRecords api: removed project results in NPE
-* CLOUDSTACK-1082 UI doesn't throw any error message when trying to delete ip range from a network that is in use
-* CLOUDSTACK-1079 Deploying AWSAPI with mvn -pl :cloud-awsapi jetty:run fails
-* CLOUDSTACK-1070 javelin: NPE on executing registerIso API
-* CLOUDSTACK-1064 A type error occurs when trying to add account/register template....
-* CLOUDSTACK-1063 "SG Enabled Advanced Zone - ""Add Guest Networks"" - When user tries to add a guest Network with scope as ""Account"" , he should NOT be presented with ""Offering for shared security group enabled"""
-* CLOUDSTACK-1057 regression of changeServiceForVirtualMachine API - fails to find service offering by serviceOfferingId parameter
-* CLOUDSTACK-1056 S3 secondary storage fails to upload systemvm template due to KVMHA directory
-* CLOUDSTACK-1055 "The overlay still exists when the ""Recurring Snapshots"" dialog is canceled by pressing esc key."
-* CLOUDSTACK-1051 API dispatcher unable to find objectVO corresponding to DeleteTemplatecmd
-* CLOUDSTACK-1050 No Documentation on Adding a Load Balancer Rule
-* CLOUDSTACK-1037 "Make cloudmonkey awesome-er: Online help docs and api discovery, better colored output, parameter value autocompletion"
-* CLOUDSTACK-1029 Enter the token to specified project is malfunctioned
-* CLOUDSTACK-1027 """Update SSL certificate"" button should properly reflect it's functionality"
-* CLOUDSTACK-1024 Regression: Unable to add Xenserver host with latest build
-* CLOUDSTACK-1021 the vlan is not creat to right nic. when i creat multi guest network.
-* CLOUDSTACK-1016 Not able to deploy VM.
-* CLOUDSTACK-1014 Merge ManagementServer and ManagementServerExt
-* CLOUDSTACK-1013 running cloudstack overwrites default public/private ssh keys
-* CLOUDSTACK-1011 KVM host getting disconnected in cluster environment
-* CLOUDSTACK-1010 Host count and Secondary storage count always shows 1 in UI
-* CLOUDSTACK-1002 Not able to start VM.
-* CLOUDSTACK-995  Not able to add the KVM host.
-* CLOUDSTACK-993  """admin"" user is not getting created when management server is started."
-* CLOUDSTACK-987  Sections missing in Working With Snapshots
-* CLOUDSTACK-985  Different MAC address for RvR caused issue in short term network outrage
-* CLOUDSTACK-978  TypeError: instance.displayname is undefined while adding VM's to the LB rule.
-* CLOUDSTACK-968  marvin: vlan should be an attribute of the physical_network and not the zone
-* CLOUDSTACK-959  Missing sub-sections in document section System Service Offerings
-* CLOUDSTACK-938  s2s VPN trouble
-* CLOUDSTACK-928  [Simulator] Latency for Agent Commands - change unit of wait from seconds to milliseconds
-* CLOUDSTACK-863  Non-printable characters (ASCII control character) such as %00 or %0025 are getting stored in raw/non encoded form in the database.
-* CLOUDSTACK-819  Create Account/User API logging password in access logs
-* CLOUDSTACK-799  [Load Test] Check router statistics falls behind in gathering stats by more than 2 times the set value
-* CLOUDSTACK-798  Move usage related cmd classes from cloud-server to cloud-api
-* CLOUDSTACK-736  Integration smoke tests: Fix check for vm name for the deployvm smoke test
-* CLOUDSTACK-734  api_refactoring: CreateAccountCmd fails to send response due to NPE in service layer
-* CLOUDSTACK-725  UI: Error when the Egress rules tab is selected for a network
-* CLOUDSTACK-721  Bytes sent/received in user statistics is empty (CloudStack 4.0)
-* CLOUDSTACK-720  Fail to load a png image when accessing the web console
-* CLOUDSTACK-717  cloudmonkey fails to parse/print response
-* CLOUDSTACK-693  Adding a VPC virtual router to a NiciraNVP enabled network fails
-* CLOUDSTACK-691  A warning dialog box shows after reloading the welcome page
-* CLOUDSTACK-689  RVR: Stop pending flag is not cleared when user start the disconnected router from another host
-* CLOUDSTACK-683  Image Is Missing in the Accessing VM Section
-* CLOUDSTACK-660  Network Traffic Labels are not functional in Marvin
-* CLOUDSTACK-648  The normal users could change their own login password
-* CLOUDSTACK-639  API Refactoring: Adapters for ACL
-* CLOUDSTACK-617  Unable to edit a Sub domain
-* CLOUDSTACK-614  "ListTemplates API is not returning ""Enable SSH Key"" attribute for any given template"
-* CLOUDSTACK-606  Starting VM fails with 'ConcurrentOperationException' in a clustered MS scenario
-* CLOUDSTACK-605  Host physical CPU is incorrectly calculated for Vmware hosts
-* CLOUDSTACK-599  DhcpEntryCommand fails on Router VM on CS4.0 and vSphere5 with Advanced Network Zone
-* CLOUDSTACK-596  DeployVM command takes a lot of time to return job id
-* CLOUDSTACK-584  "typos in ""Apache_CloudStack-4.0.0-incubating-CloudStack_Nicira_NVP_Guide-en-US"""
-* CLOUDSTACK-573  "NPE at ""com.cloud.network.NetworkManagerImpl.networkOfferingIsConfiguredForExternalNetworking(NetworkManagerImpl.java:4345)"" when create network from the network offering having NULL provider for the service"
-* CLOUDSTACK-572  SG Enabled Advanced Zone - Not able to deploy a VM in an account specific shared network.
-* CLOUDSTACK-560  Usage server doesn't work in 4.0.0 due to missing db changes
-* CLOUDSTACK-556  Erratic window behavior in Quick View tooltip
-* CLOUDSTACK-553  "SRX - When adding SRX device make ""Public Network"" - default to ""untrusted"" and ""Private Network"" - default to ""trusted"" as un-editable fields."
-* CLOUDSTACK-552  ]Quick view details for a volume displays scroll bar in place of name of the volume when the name of the volume has more no of characters
-* CLOUDSTACK-539  Cropped Text in UI under Quick View
-* CLOUDSTACK-536  remove citrix cloudpatform from 4.0 build - CloudStack is ASF project
-* CLOUDSTACK-527  List API performance optimization by using DB views and removing UUID conversion.
-* CLOUDSTACK-522  Log requests in cloudmonkey's log file
-* CLOUDSTACK-520  Dependency jar names mismatch with install-non-oss.sh
-* CLOUDSTACK-518  API refactoring -- change @Parameter annotation and remove the @IdentityMapper annotation
-* CLOUDSTACK-514  Marvin and Cloudmonkey don't work when an API target uses https or an alternate path
-* CLOUDSTACK-510  Add button not visible when adding public IPs to physical network
-* CLOUDSTACK-508  CLVM copies template to primary storage unnecessarily
-* CLOUDSTACK-507  fix api docs for listSSHKeyPairs
-* CLOUDSTACK-504  Duplicate guest password scripts in codebase
-* CLOUDSTACK-501  Apidocs and marvin does not know how to handle Autoscaling docs
-* CLOUDSTACK-500  Passwd-server iptables rules are dropped on domr on fresh start or on reboot
-* CLOUDSTACK-499  cloudmonkey CLI can't accept complex parameters
-* CLOUDSTACK-493  2.2.x-3.0 DB upgrade support for Advance SG enabled networks
-* CLOUDSTACK-481  Installation Guide Doc Error
-* CLOUDSTACK-467  Developer's Guide points to cloud.com for API reference
-* CLOUDSTACK-465  French language file quotes are dropping javascript syntax errors
-* CLOUDSTACK-464  "Regression in AWSAPI docs, entire sections removed"
-* CLOUDSTACK-462  A few corrections to make to the 4.0.0 installation guide
-* CLOUDSTACK-459  [Optional Public IP assignment for EIP with Basic Zone] Associate IP Checkbox in Create Network Offering Dialog is Displayed When Elastic LB is Selected
-* CLOUDSTACK-456  License tag in SPEC isn't what RPM is expecting
-* CLOUDSTACK-448  SSVM bootstrap failure on XenServer hosts with E3 CPU
-* CLOUDSTACK-446  "Host going to alert state, if you are adding already added host"
-* CLOUDSTACK-441  Running mgmt server using jetty fails to start api server
-* CLOUDSTACK-435  Vmware network labels are ignored when creating a Zone using basic networking
-* CLOUDSTACK-427  Change hardcoded step number references to dynamic links
-* CLOUDSTACK-424  Updated userdata not propagating to the VR.
-* CLOUDSTACK-417  Handle password server securely to run on port 8080 on VR
-* CLOUDSTACK-416  XCP 1.6beta2 (61002c) - can't add a host
-* CLOUDSTACK-404  Update docs on the usage of cloud-setup-databases
-* CLOUDSTACK-398  Install Guide: Section 11.17.3 (Using VPN with Mac OSX): Not complete?
-* CLOUDSTACK-397  Install Guide: Section 11.1 (Guest Traffic): Diagram is the wrong diagram
-* CLOUDSTACK-390  Install Guide: Section 4.5.7 (Prepare the System VM Template): Links go to cloud.com
-* CLOUDSTACK-378  mavenize marvin on master
-* CLOUDSTACK-377  provide deployment config access to marvin's testcase
-* CLOUDSTACK-373  "static NAT and Firewall is not working on external firewall device SRX, it needs to be implemented"
-* CLOUDSTACK-369  ASF 4.0 - unable to support XenServer 6.1 host
-* CLOUDSTACK-364  Docs point to download.cloud.com for AWS API script
-* CLOUDSTACK-361  Wrong creation of guest networks on a KVM host in Multiple Physical Networks with guest traffic
-* CLOUDSTACK-359  PropagateResourceEventCommand failes in cluster configuration
-* CLOUDSTACK-357  "ISOs can be deleted while still attached to a running VM, and they subsequently cannot be detached from a running VM"
-* CLOUDSTACK-355  "Fix ""count"" in a bunch of API commands"
-* CLOUDSTACK-348  deleteNetwork does not clean up network resource count correctly
-* CLOUDSTACK-347  listNetworks API: return vlan information only when the caller is ROOT admin
-* CLOUDSTACK-346  Cannot add Vmware cluster with class loader conflict exception
-* CLOUDSTACK-335  KVM VPC load balancer not working
-* CLOUDSTACK-333  When Datacenter name in VCenter has spaces Primary Storage (VMFS) discovery will fail
-* CLOUDSTACK-332  """count"" property in list* API response should be equal to how many entries in database, not how many objects in API response"
-* CLOUDSTACK-318  Adding XenServer Host Fails - 6.0.2 fails with 4.0.0
-* CLOUDSTACK-304  Add synchronization for createSnapshot command per host basis
-* CLOUDSTACK-293  "We do awful, hacky things in our spec file for client"
-* CLOUDSTACK-290  3.0.0 template also needed for 2.2.14 to 3.0.5 direct upgrade.
-* CLOUDSTACK-284  listVirtualMachines does not return deleted machines when zone is specified
-* CLOUDSTACK-279  deleteProject fails when executed by the regular user (works fine for root/domain admin)
-* CLOUDSTACK-274  Two error codes mapped to same value in API
-* CLOUDSTACK-271  updatePhysicalNetwork dies with an NPE when the vlan range is empty
-* CLOUDSTACK-256  "vpn:As an admin user , not able to delete VPN user which is present in a regular user's network."
-* CLOUDSTACK-250  Incorrect description of maintenance mode in admin guide
-* CLOUDSTACK-249  Add host id to failed VM deploy alerts
-* CLOUDSTACK-235  Network rate can be set in 2 places. Clarify docs on how this works.
-* CLOUDSTACK-232  Zone infrastructure chart -- disable resource total display
-* CLOUDSTACK-228  UI provides an option to reconnect a disconnected host - ServerApiException is thrown on an attempt
-* CLOUDSTACK-227  ReconnectHostCmd: NullPointerException: Unable to get host Information for XenServer 6.0.2 host - on intentionally changing the traffic labels on the physical network
-* CLOUDSTACK-226  UpdatePhysicalNetworkcommand failed due to java.sql.BatchUpdateException ; Tried to extend the existing Guest VLAN Range of one physical network into the Guest VLAN range of the other physical network
-* CLOUDSTACK-225  API Docs: Request params repeated with different descriptions
-* CLOUDSTACK-222  Admin UI prompts to restart Management server with cancel edit operation
-* CLOUDSTACK-178  Expose name parameter of VM in list Vm view.
-* CLOUDSTACK-130  Clarify docs on tags parameter in API reference
-* CLOUDSTACK-119  Move Agent-Simulator in to the hypervisor plugin model
-* CLOUDSTACK-118  "Status of host resorce stuck in ""ErrorInMaintenance"""
-* CLOUDSTACK-95   IP address allocation not working when a user tries to allocate IP addresses in a Project.
-* CLOUDSTACK-70   Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails
-* CLOUDSTACK-46   Remnants of mycloud remain
-
-Security Fixes:
-
- * CVE-2012-4501: Apache CloudStack configuration vulnerability
-
-
-Version 4.0.2
-------------------------
-
-This is a maintenance release for the Apache CloudStack 4.0.x series, with no new features.
-
-Issues fixed in this release:
-
-* CLOUDSTACK-354: Display of storage statistics is wrong.
-* CLOUDSTACK-397: Install Guide: Section 11.1 (Guest Traffic): Diagram is the wrong diagram
-* CLOUDSTACK-398: Install Guide: Section 11.17.3 (Using VPN with Mac OSX): Not complete?
-* CLOUDSTACK-462: A few corrections to make to the 4.0.0 installation guide
-* CLOUDSTACK-524: http proxy used by ssvm (secstorage.proxy) NOT working
-* CLOUDSTACK-587: MEMORY_CONSTRAINT_VIOLATIONMemory limits must satisfy:
-* CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host
-* CLOUDSTACK-810: Make DirectAgent thread pool size configurable
-* CLOUDSTACK-976: unable to start cloudstack (error: "java.lang.NoSuchMethodError: org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString([B)Ljava/lang/String;")
-* CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table
-* CLOUDSTACK-990: Documentation issue with libvirtd.conf tcp_port configuration
-* CLOUDSTACK-1088: EnableStaticNat error will clear the data in database
-* CLOUDSTACK-1106: Missing documentation for cloud-setup-databases
-* CLOUDSTACK-1110: Documentation missing "Management Server Load Balancing"
-* CLOUDSTACK-1112: Errors in "Prepare the System VM Template"
-* CLOUDSTACK-1137: Force reconnect of a disconnected state complains about the state of the host.
-* CLOUDSTACK-1150: Documentation for libvirt on Ubuntu 12.04
-* CLOUDSTACK-1151: vmware systemVm template upgrade is missing in 4.0 upgrade
-* CLOUDSTACK-1211: Network operations are Blocked for the Read-only file system of Virtual Router
-* CLOUDSTACK-1265: logrotate dnsmasq configuration is wrong
-* CLOUDSTACK-1291: duplicate arguments in commands.xml prevents cloudapis.py to run to completion
-* CLOUDSTACK-1298: typo in deb package setup
-* CLOUDSTACK-1299: Errors in 4.5.5 section of installation guide
-* CLOUDSTACK-1300: section in wrong order in installation guide
-* CLOUDSTACK-1341: URL for the KEYs file is wrong in the installation guide
-* CLOUDSTACK-1419: Apache-ify and apply trademark logos in the UI
-* CLOUDSTACK-1420: Ensure trademarks are properly attributed in publican brand.
-* CLOUDSTACK-1589: Ubuntu 4.0 packages depend on non-existent chkconfig
-* CLOUDSTACK-1629: Need to move location or conflict with antlr
-* CLOUDSTACK-1642: Add support CentOS 6.4
-* CLOUDSTACK-1648: Unable to add KVM host
-* CLOUDSTACK-1652: /etc/hosts error in virtual router when deploy instance with the name same to previous instances
-* CLOUDSTACK-1666: KVM VPC NetworkUsage doesnot work
-* CLOUDSTACK-1668: IP conflict in VPC tier
-* CLOUDSTACK-1761: Available local storage disk capacity incorrectly reported in KVM to manager.
-* CLOUDSTACK-1845: KVM - storage migration often fails
-* CLOUDSTACK-1846: KVM - storage pools can silently fail to be unregistered, leading to failure to register later
-* CLOUDSTACK-2003: Deleting domain while deleted account is cleaning up leaves VMs expunging forever due to 'Failed to update resource count'
-* CLOUDSTACK-2090: Upgrade from version 4.0.1 to version 4.0.2 triggers the 4.0.0 to 4.0.1. 
-* CLOUDSTACK-2091: Error in API documentation for 4.0.x.
-
-
-Version 4.0.1-incubating
-------------------------
-
-This is a bugfix release for Apache CloudStack 4.0.0-incubating, with no new features. 
-
-Security Fixes:
-
-* CVE-2012-5616: Local Information Disclosure Vulnerability (See CLOUDSTACK-505)
-
-Bugs fixed in this release:
-
-* CLOUDSTACK-359: PropagateResourceEventCommand fails in cluster configuration
-* CLOUDSTACK-374: When running cloud-setup-databases, it auto chooses the highest priority nic (lowest number ie: eth0)
-* CLOUDSTACK-389: Install Guide: Section 4.5.5 (Prepare NFS Shares): Confusing statement about iSCSI
-* CLOUDSTACK-395: Primary Storage and Secondary Storage sections missing sub-sections
-* CLOUDSTACK-411: Add another step during kvm agent installation on Ubuntu machine
-* CLOUDSTACK-415: restartNetwork call causes VM to be unreachable when Nicira based SDN is used.
-* CLOUDSTACK-422: XSL files missing license header.
-* CLOUDSTACK-426: SetVPCStaticNatRules unimplemented for KVM.
-* CLOUDSTACK-448: SSVM bootstrap failure on XenServer hosts with E3 CPU.
-* CLOUDSTACK-465: French language file quotes are dropping javascript syntax errors.
-* CLOUDSTACK-473: API Doc for uploadCustomCertificate doesn't explain how to use the optional parameters well.
-* CLOUDSTACK-480: Installation Documentation error: Section 4.5.5.2 needs to mention nfs-kernel-server.
-* CLOUDSTACK-481: Installation Guide Doc Error
-* CLOUDSTACK-498: Missing dependency in RPM of KVM Agent.
-* CLOUDSTACK-502: VPC router needs to resolve its hostname.
-* CLOUDSTACK-505: cloudstack logs the private key in plaintext.
-* CLOUDSTACK-507: fix api docs for listSSHKeyPairs.
-* CLOUDSTACK-515: NVP installation.
-* CLOUDSTACK-536: remove citrix cloudpatform from 4.0 build - CloudStack is ASF project.
-* CLOUDSTACK-560: Usage server doesn't work in 4.0.0 due to missing db changes.
-* CLOUDSTACK-580: Packages are named with 4.0 with 4.0.1 build.
-* CLOUDSTACK-591: Wrong vnet in iptables on KVM hypervisors after VM reboot.
-* CLOUDSTACK-595: Recreate root volume scenarios doesn't work in VMware
-* CLOUDSTACK-603: Upgrade from 4.0 to 4.0.1 is not enabled.
-* CLOUDSTACK-605: Host physical CPU is incorrectly calculated for VMware host
-* CLOUDSTACK-622: In the add primary storage dialog in the ui the RBD fields don't disappear when changing from RBD to another protocol.
-* CLOUDSTACK-683: Image is missing in the Accessing VM Section
-* CLOUDSTACK-685: CloudStack 4.0 Network Usage is ZERO
-* CLOUDSTACK-938: s2s VPN trouble
-* CLOUDSTACK-961: Installation docs don't detail dependencies for building RPMs
-* CLOUDSTACK-995: Not able to add the KVM host
-
-
-Version 4.0.0-incubating
-------------------------
-
-This is the first release of CloudStack from within the Apache Software Foundation.
-
-Build Tool Changes:
-
- * The project now uses a combination of maven3 and ant for building
- * License header auditing is now implemented via the Apache RAT Maven plugin
- * Some integrations have been disabled in the default build, due to the license types of our dependencies (See README.md for details on how to build with the optional capabilities)
-
-New Features:
-
- * Inter-VLAN Routing (VPC)
- * Site-to-Site VPN
- * Local Storage Support for Data Volumes
- * Virtual Resource Tagging
- * Secure Console Access on XenServer
- * Added the ability to create a VM without immediately starting it (via API)
- * Upload an Existing Volume to a Virtual Machine
- * Dedicated High-Availability Hosts
- * Support for Amazon Web Services API (formerly a separate package)
- * AWS API Extensions to include Tagging
- * Support for Nicira NVP (L2)
- * Ceph RBD Support for KVM
- * Support for Caringo as Secondary Storage
- * KVM Hypervisor support upgraded to work with Ubuntu 12.04 and RHEL 6.3
-
-Security Fixes:
-
- * CVE-2012-4501: Apache CloudStack configuration vulnerability


[15/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

Posted by da...@apache.org.
CLOUDSTACK-7184 retry-wait loop config to deal with network glitches


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b82f27be
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b82f27be
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b82f27be

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: b82f27be4150e70c017ed2597137319daa79560b
Parents: 7a694d4
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Sep 16 12:20:30 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Sep 16 12:49:36 2014 +0200

----------------------------------------------------------------------
 .../com/cloud/agent/manager/DirectAgentAttache.java    | 13 ++++++++++++-
 .../hypervisor/xen/resource/CitrixResourceBase.java    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b82f27be/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
index 7ca6929..480a7af 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.log4j.Logger;
+import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.agent.api.Answer;
@@ -40,6 +41,10 @@ import com.cloud.resource.ServerResource;
 public class DirectAgentAttache extends AgentAttache {
     private final static Logger s_logger = Logger.getLogger(DirectAgentAttache.class);
 
+    protected final ConfigKey<Integer> _HostPingRetryCount = new ConfigKey<Integer>("Advanced", Integer.class, "host.ping.retry.count", "2",
+            "Number of times retrying a host ping while waiting for check results", true);
+    protected final ConfigKey<Integer> _HostPingRetryTimer = new ConfigKey<Integer>("Advanced", Integer.class, "host.ping.retry.timer", "20",
+            "Interval to wait before retrying a host ping while waiting for check results", true);
     ServerResource _resource;
     List<ScheduledFuture<?>> _futures = new ArrayList<ScheduledFuture<?>>();
     AgentManagerImpl _mgr;
@@ -161,7 +166,13 @@ public class DirectAgentAttache extends AgentAttache {
                 ServerResource resource = _resource;
 
                 if (resource != null) {
-                    PingCommand cmd = resource.getCurrentStatus(_id);
+                    PingCommand cmd = null;
+                    int retried = 0;
+                    while ( cmd == null && ++retried < _HostPingRetryCount.value())
+                    {
+                        cmd = resource.getCurrentStatus(_id);
+                        Thread.sleep(1000*_HostPingRetryTimer.value());
+                    }
                     if (cmd == null) {
                         s_logger.warn("Unable to get current status on " + _id + "(" + _name + ")");
                         return;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b82f27be/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 644ef65..a399c98 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4276,7 +4276,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             if (!pingXAPI()) {
                 Thread.sleep(1000);
                 if (!pingXAPI()) {
-                    s_logger.warn(" can not ping xenserver " + _host.uuid);
+                    s_logger.warn("can not ping xenserver " + _host.uuid);
                     return null;
                 }
             }