You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/03/25 18:18:23 UTC

git commit: CLOUDSTACK-5103 CLOUDSTACK-5125 db ha and api changes

Repository: cloudstack-docs
Updated Branches:
  refs/heads/master 82914a864 -> ba37f20e4


CLOUDSTACK-5103 CLOUDSTACK-5125 db ha and api changes


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

Branch: refs/heads/master
Commit: ba37f20e4fc1467de15edcd159eeffdebf12c14a
Parents: 82914a8
Author: radhikap <ra...@citrix.com>
Authored: Tue Mar 25 22:46:51 2014 +0530
Committer: radhikap <ra...@citrix.com>
Committed: Tue Mar 25 22:47:56 2014 +0530

----------------------------------------------------------------------
 en-US/Developers_Guide.xml                      |   2 +-
 en-US/changed-API-commands-4.3.xml              | 619 +++++++++++++++++++
 en-US/db-ha.xml                                 | 216 +++++--
 en-US/ha-enabled-vm.xml                         |  36 +-
 en-US/ha-for-hosts.xml                          |  33 +-
 en-US/ha-management-server.xml                  |  48 +-
 en-US/images/event-replica.png                  | Bin 0 -> 13224 bytes
 en-US/primary-storage-outage-and-data-loss.xml  |  51 +-
 .../secondary-storage-outage-and-data-loss.xml  |  38 +-
 en-US/sys-reliability-and-ha.xml                |  20 +-
 en-US/whats-new.xml                             |   5 +
 11 files changed, 925 insertions(+), 143 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/Developers_Guide.xml
----------------------------------------------------------------------
diff --git a/en-US/Developers_Guide.xml b/en-US/Developers_Guide.xml
index 7452e29..7106faf 100644
--- a/en-US/Developers_Guide.xml
+++ b/en-US/Developers_Guide.xml
@@ -26,7 +26,7 @@
     <bookinfo id="cloudstack_developers">
         <title>&PRODUCT; Developer's Guide</title>
         <productname>Apache CloudStack</productname>
-        <productnumber>4.2.0</productnumber>
+        <productnumber>4.3.0</productnumber>
         <edition></edition>
         <pubsnumber></pubsnumber>
         <abstract>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/changed-API-commands-4.3.xml
----------------------------------------------------------------------
diff --git a/en-US/changed-API-commands-4.3.xml b/en-US/changed-API-commands-4.3.xml
new file mode 100644
index 0000000..8c4d962
--- /dev/null
+++ b/en-US/changed-API-commands-4.3.xml
@@ -0,0 +1,619 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- 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.
+-->
+<section id="changed-api-commands-4.3">
+  <title>API Changes Introduced in 4.3</title>
+  <para>Here are the list of APIs changed as part of the 4.3 release.</para>
+ 
+  <section id="hyperv-api">
+    <title>Hyper-V</title>
+    <informaltable>
+      <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <colspec colwidth="1.0*" colname="1" colnum="1"/>
+        <colspec colwidth="9.87*" colname="2" colnum="2"/>
+        <thead>
+          <row>
+            <entry><para>API</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>addPrimaryStorage</para></entry>
+            <entry><para>To this existing API, the following field has been added:
+              smb</para></entry>
+          </row>
+          <row>
+            <entry><para>addImageStore</para></entry>
+            <entry><para>To this existing API, the following field has been added:
+              smb</para></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </section>
+  <section id="socket-api">
+    <title>Reporting CPU Sockets</title>
+    <informaltable>
+      <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <colspec colwidth="1.0*" colname="1" colnum="1"/>
+        <colspec colwidth="9.87*" colname="2" colnum="2"/>
+        <thead>
+          <row>
+            <entry><para>API</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>listhost</para></entry>
+            <entry><para>To this existing API, the following request parameter has been added:
+                hypervisor.</para><para>The new response parameter added is: cpusockets</para>
+              <para>cpusockets returns the number of CPU sockets on the host.</para></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </section>
+  <section id="nfs-object">
+    <title>Migrating NFS Secondary Storages to Use Object Store</title>
+    <informaltable>
+      <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <colspec colwidth="1.0*" colname="1" colnum="1"/>
+        <colspec colwidth="9.87*" colname="2" colnum="2"/>
+        <thead>
+          <row>
+            <entry><para>API</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>updateCloudToUseObjectStore</para></entry>
+            <entry><para>Migrate current NFS secondary storages to use object store.</para></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </section>
+  <section id="ldap-apis">
+    <title>LDAP Authentication</title>
+    <informaltable>
+      <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <colspec colwidth="1.0*" colname="1" colnum="1"/>
+        <colspec colwidth="9.87*" colname="2" colnum="2"/>
+        <thead>
+          <row>
+            <entry><para>API</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>listLdapConfigurations</para></entry>
+            <entry><para>Lists all the LDAP configurations.</para></entry>
+          </row>
+          <row>
+            <entry><para>addLdapConfiguration</para></entry>
+            <entry><para>Add a new LDAP Configuration.</para></entry>
+          </row>
+          <row>
+            <entry><para>deleteLdapConfiguration</para></entry>
+            <entry><para>Removes an LDAP Configuration.</para></entry>
+          </row>
+          <row>
+            <entry><para>listLdapUsers</para></entry>
+            <entry><para>Lists all the LDAP users.</para></entry>
+          </row>
+          <row>
+            <entry><para>ldapCreateAccount</para></entry>
+            <entry><para>Creates an account from an LDAP user.</para></entry>
+          </row>
+          <row>
+            <entry><para>importLdapUsers</para></entry>
+            <entry><para>Import LDAP users.</para></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+    <para>The following APIs have been deprecated: ldapConfig and ldapRemove </para>
+  </section>
+  <section id="alert-api">
+    <title>Publishing Alerts Using the Web ROOT Admin API</title>
+    <informaltable>
+      <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <colspec colwidth="1.0*" colname="1" colnum="1"/>
+        <colspec colwidth="9.87*" colname="2" colnum="2"/>
+        <thead>
+          <row>
+            <entry><para>API</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>generateAlert</para></entry>
+            <entry><para>A new API has been added to generate and publish alerts for usage services.
+                The usage services can be installed on a different host or the same host where the
+                Management Server is running. This API is available only to the Root
+              Admin.</para></entry>
+          </row>
+          <row>
+            <entry><para>listAlerts</para></entry>
+            <entry><para>To this existing API, a new response parameter has been added: name. An
+                alert can be searched on the basis of alert name.</para></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </section>
+  <section id="dynamic-compute">
+    <title>Dynamic Compute Offering</title>
+    <informaltable>
+      <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <colspec colwidth="1.0*" colname="1" colnum="1"/>
+        <colspec colwidth="9.87*" colname="2" colnum="2"/>
+        <thead>
+          <row>
+            <entry><para>API</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>DeployVM</para></entry>
+            <entry><para>To this existing API, the following request parameter has been added:
+                details.</para></entry>
+          </row>
+          <row>
+            <entry><para>ScaleVM</para></entry>
+            <entry><para>To this existing API, the following request parameter has been added:
+                details.</para></entry>
+          </row>
+          <row>
+            <entry><para>ScaleSystemVM</para></entry>
+            <entry><para>To this existing API, the following request parameter has been added:
+                details.</para></entry>
+          </row>
+          <row>
+            <entry><para>UpgradeVM</para></entry>
+            <entry><para>To this existing API, the following request parameter has been added:
+                details.</para></entry>
+          </row>
+          <row>
+            <entry><para>UpgradeSysytemVM</para></entry>
+            <entry><para>To this existing API, the following request parameter has been added:
+                details.</para></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </section>
+  <section id="vr-api">
+    <title>Enhanced Upgrade for Virtual Routers</title>
+    <informaltable>
+      <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <colspec colwidth="1.0*" colname="1" colnum="1"/>
+        <colspec colwidth="9.87*" colname="2" colnum="2"/>
+        <thead>
+          <row>
+            <entry><para>API</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>upgradeRouterTemplate</para></entry>
+            <entry><para>This is a new API which has been added in this release.</para>
+              <para>The following are the request parameters:</para>
+              <itemizedlist>
+                <listitem>
+                  <para>id: Upgrade the specified VR</para>
+                </listitem>
+                <listitem>
+                  <para>zone_id : Upgrade the VRs in the specified zone.</para>
+                </listitem>
+                <listitem>
+                  <para>pod_id : Upgrade the VRs in the specified pod.</para>
+                </listitem>
+                <listitem>
+                  <para>cluster_id : Upgrade the VRs in the specified cluster.</para>
+                </listitem>
+                <listitem>
+                  <para>domain_id : Upgrade the VRs belonging to the specified domain.</para>
+                </listitem>
+                <listitem>
+                  <para>account_id : Upgrade the VRs belonging to the specified account.</para>
+                </listitem>
+              </itemizedlist>
+            </entry>
+          </row>
+          <row>
+            <entry><para>listRouters</para></entry>
+            <entry><para>For this existing API, the following request parameters has been
+                added:</para>
+              <itemizedlist>
+                <listitem>
+                  <para>version: Lists routers by specified version.</para>
+                </listitem>
+                <listitem>
+                  <para>zone_id : lists routers in specified zone.</para>
+                </listitem>
+                <listitem>
+                  <para>pod_id : Lists routers in the specified pod.</para>
+                </listitem>
+                <listitem>
+                  <para>cluster_id : Lists routers in the specified cluster.</para>
+                </listitem>
+                <listitem>
+                  <para>domain_id : Lists routers owned by specified domain.</para>
+                </listitem>
+                <listitem>
+                  <para>account: Lists routers owned by specified account.</para>
+                </listitem>
+              </itemizedlist>
+              <para>The following response parameters has been added:</para>
+              <itemizedlist>
+                <listitem>
+                  <para>version : (String) The router version. For example, 4.3.0.</para>
+                </listitem>
+                <listitem>
+                  <para>requiresupgrade: (Boolean) The flag to indicate if the router template
+                    requires an upgrade.</para>
+                </listitem>
+              </itemizedlist></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+    <section id="otherapis-4.3">
+      <title>Assorted List of Changed APIs</title>
+       <itemizedlist>
+    <listitem>
+      <para>expungeVirtualMachine</para>
+      <para>Expunge a virtual machine. Once expunged, it cannot be recovered.</para>
+    </listitem>
+    <listitem>
+      <para>revertSnapshot</para>
+      <para>Reverts a volume snapshot.</para>
+    </listitem>
+    <listitem>
+      <para>reconnectHost </para>
+      <para>New response parameters: cpusockets</para>
+    </listitem>
+    <listitem>
+      <para>copyTemplate </para>
+      <para>Changed request parameters: sourcezoneid (optional) </para>
+    </listitem>
+    <listitem>
+      <para>listRouters</para>
+      <para>New request parameters: clusterid (optional), version (optional) </para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>New removed parameters: templateversion </para>
+    </listitem>
+    <listitem>
+      <para>createVpnConnection</para>
+      <para>New request parameters: passive (optional) </para>
+      <para>New response parameters: passive</para>
+    </listitem>
+    <listitem>
+      <para>listVolumes </para>
+      <para>New request parameters: storageid (optional) </para>
+      <para>New response parameters: path, quiescevm, storageid</para>
+    </listitem>
+    <listitem>
+      <para>migrateVolume</para>
+      <para>New response parameters: path, quiescevm, storageid</para>
+    </listitem>
+    <listitem>
+      <para>enableStorageMaintenance </para>
+      <para>New response parameters: storagecapabilities</para>
+    </listitem>
+    <listitem>
+      <para>stopRouter</para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion</para>
+    </listitem>
+    <listitem>
+      <para>attachVolume </para>
+      <para>New response parameters: path, quiescevm, storageid</para>
+    </listitem>
+    <listitem>
+      <para>listAlerts </para>
+      <para>New request parameters: name (optional)</para>
+      <para>New response parameters: name </para>
+    </listitem>
+    <listitem>
+      <para>updateVolume</para>
+      <para>New request parameters: displayvolume (optional), state (optional), storageid
+        (optional)</para>
+      <para>Changed parameters: id (optional), path (optional) </para>
+      <para>New response parameters: path, quiescevm, storageid </para>
+    </listitem>
+    <listitem>
+      <para>cancelHostMaintenance </para>
+      <para>New response parameters: cpusockets</para>
+    </listitem>
+    <listitem>
+      <para>updateServiceOffering </para>
+      <para>New response parameters: iscustomized</para>
+    </listitem>
+    <listitem>
+      <para>updateStoragePool </para>
+      <para>New response parameters: storagecapabilities</para>
+    </listitem>
+    <listitem>
+      <para>addBaremetalHost </para>
+      <para>New response parameters: cpusockets</para>
+    </listitem>
+    <listitem>
+      <para>resizeVolume </para>
+      <para>New response parameters: path, quiescevm, storageid</para>
+    </listitem>
+    <listitem>
+      <para>createVMSnapshot </para>
+      <para>New request parameters: quiescevm (optional)</para>
+    </listitem>
+    <listitem>
+      <para>createIpForwardingRule</para>
+      <para>New response parameters: networkid </para>
+    </listitem>
+    <listitem>
+      <para>updateDiskOffering </para>
+      <para>New request parameters: displayoffering (optional)</para>
+    </listitem>
+    <listitem>
+      <para>listCapabilities </para>
+      <para>New response parameters: kvmsnapshotenabled </para>
+      <para>Removed parameters: KVMsnapshotenabled</para>
+    </listitem>
+    <listitem>
+      <para>startInternalLoadBalancerVM </para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion </para>
+    </listitem>
+    <listitem>
+      <para>updatePortForwardingRule </para>
+      <para>New response parameters: networkid</para>
+    </listitem>
+    <listitem>
+      <para>listPortForwardingRules </para>
+      <para>New request parameters: networkid (optional) </para>
+      <para>New response parameters: networkid</para>
+    </listitem>
+    <listitem>
+      <para>cancelStorageMaintenance </para>
+      <para>New response parameters: storagecapabilities</para>
+    </listitem>
+    <listitem>
+      <para>deployVirtualMachine </para>
+      <para>New request parameters: details (optional)</para>
+    </listitem>
+    <listitem>
+      <para>createPortForwardingRule </para>
+      <para>New response parameters: networkid</para>
+    </listitem>
+    <listitem>
+      <para>createVPCOffering </para>
+      <para>New request parameters: serviceofferingid (optional)</para>
+    </listitem>
+    <listitem>
+      <para>destroyRouter </para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion</para>
+    </listitem>
+    <listitem>
+      <para>updateTrafficType </para>
+      <para>New request parameters: hypervnetworklabel (optional) </para>
+      <para>New response parameters: hypervnetworklabel</para>
+    </listitem>
+    <listitem>
+      <para>addHost </para>
+      <para>New response parameters: cpusockets</para>
+    </listitem>
+    <listitem>
+      <para>rebootRouter</para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion</para>
+    </listitem>
+    <listitem>
+      <para>updateHost </para>
+      <para>New response parameters: cpusockets</para>
+    </listitem>
+    <listitem>
+      <para>detachVolume </para>
+      <para>New response parameters: path, quiescevm, storageid</para>
+    </listitem>
+    <listitem>
+      <para>listSnapshots </para>
+      <para>New response parameters: revertable</para>
+    </listitem>
+    <listitem>
+      <para>updateLoadBalancerRule </para>
+      <para>New response parameters: protocol</para>
+    </listitem>
+    <listitem>
+      <para>listRemoteAccessVpns </para>
+      <para>New request parameters: id (optional), networkid (optional) </para>
+      <para>Changed parameters: publicipid (optional)</para>
+    </listitem>
+    <listitem>
+      <para>prepareHostForMaintenance </para>
+      <para>New response parameters: cpusockets </para>
+    </listitem>
+    <listitem>
+      <para>stopInternalLoadBalancerVM </para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion</para>
+    </listitem>
+    <listitem>
+      <para>listLoadBalancerRules </para>
+      <para>New response parameters: protocol </para>
+    </listitem>
+    <listitem>
+      <para>listResourceDetails </para>
+      <para>New request parameters: fordisplay (optional) </para>
+      <para>Changed parameters: resourcetype (required), resourceid (required)</para>
+    </listitem>
+    <listitem>
+      <para>scaleVirtualMachine </para>
+      <para>New request parameters: details (optional)</para>
+    </listitem>
+    <listitem>
+      <para>changeServiceForRouter </para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion</para>
+    </listitem>
+    <listitem>
+      <para>updateZone </para>
+      <para>New response parameters: resourcedetails, tags(*) </para>
+      <para>Removed parameters: affinitygroupid</para>
+    </listitem>
+    <listitem>
+      <para>listFirewallRules </para>
+      <para>New request parameters: networkid (optional)</para>
+    </listitem>
+    <listitem>
+      <para>createZone </para>
+      <para>New response parameters: resourcedetails, tags(*) </para>
+      <para>Removed parameters: affinitygroupid</para>
+    </listitem>
+    <listitem>
+      <para>deleteNetwork </para>
+      <para>New request parameters: forced (optional)</para>
+    </listitem>
+    <listitem>
+      <para>changeServiceForSystemVm </para>
+      <para>New request parameters: details (optional)</para>
+    </listitem>
+    <listitem>
+      <para>createStoragePool </para>
+      <para>New response parameters: storagecapabilities</para>
+    </listitem>
+    <listitem>
+      <para>addTrafficType </para>
+      <para>New request parameters: hypervnetworklabel (optional), isolationmethod (optional) </para>
+      <para>New response parameters: hypervnetworklabel </para>
+    </listitem>
+    <listitem>
+      <para>createServiceOffering </para>
+      <para>Changed request parameters: memory (optional), cpunumber (optional), cpuspeed (optional) </para>
+      <para>New response parameters: iscustomized</para>
+    </listitem>
+    <listitem>
+      <para>createVPC </para>
+      <para>New request parameters: start (optional)</para>
+    </listitem>
+    <listitem>
+      <para>listZones </para>
+      <para>New request parameters: tags (optional) </para>
+      <para>New response parameters: resourcedetails, tags(*) </para>
+      <para>Removed parameters: affinitygroupid </para>
+    </listitem>
+    <listitem>
+      <para>createVolume </para>
+      <para>New request parameters: virtualmachineid (optional) </para>
+      <para>New response parameters: path, quiescevm, storageid </para>
+    </listitem>
+    <listitem>
+      <para>startRouter </para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion</para>
+    </listitem>
+    <listitem>
+      <para>changeServiceForVirtualMachine </para>
+      <para>New request parameters: details (optional)</para>
+    </listitem>
+    <listitem>
+      <para>listStoragePools </para>
+      <para>New response parameters: storagecapabilities </para>
+    </listitem>
+    <listitem>
+      <para>resetVpnConnection </para>
+      <para>New response parameters: passive</para>
+    </listitem>
+    <listitem>
+      <para>createPrivateGateway </para>
+      <para>New request parameters: networkofferingid (optional)</para>
+    </listitem>
+    <listitem>
+      <para>listServiceOfferings </para>
+      <para>New response parameters: iscustomized</para>
+    </listitem>
+    <listitem>
+      <para>createLoadBalancerRule </para>
+      <para>New request parameters: protocol (optional) </para>
+      <para>New response parameters: protocol</para>
+    </listitem>
+    <listitem>
+      <para>createNetworkOffering </para>
+      <para>New request parameters: keepaliveenabled (optional)</para>
+    </listitem>
+    <listitem>
+      <para>copyIso </para>
+      <para>Changed request parameters: sourcezoneid (optional)</para>
+    </listitem>
+    <listitem>
+      <para>uploadVolume </para>
+      <para>New response parameters: path, quiescevm, storageid</para>
+    </listitem>
+    <listitem>
+      <para>createSnapshot </para>
+      <para>New request parameters: quiescevm (optional) </para>
+      <para>New response parameters: revertable</para>
+    </listitem>
+    <listitem>
+      <para>listIpForwardingRules </para>
+      <para>New response parameters: networkid</para>
+    </listitem>
+    <listitem>
+      <para>createDiskOffering </para>
+      <para>New request parameters: hypervisorsnapshotreserve (optional)</para>
+    </listitem>
+    <listitem>
+      <para>listInternalLoadBalancerVMs </para>
+      <para>New response parameters: requiresupgrade, version </para>
+      <para>Removed parameters: templateversion </para>
+    </listitem>
+    <listitem>
+      <para>scaleSystemVm Request: New parameters: details (optional)</para>
+    </listitem>
+    <listitem>
+      <para>listHosts </para>
+      <para>New request parameters: hypervisor (optional) Response: New parameters:
+        cpusockets</para>
+    </listitem>
+    <listitem>
+      <para>listVpnConnections</para>
+      <para>New response parameters: passive</para>
+    </listitem>
+    <listitem>
+      <para>updateNetworkOffering </para>
+      <para>Request: New parameters: keepaliveenabled (optional) </para>
+    </listitem>
+    <listitem>
+      <para>findStoragePoolsForMigration</para>
+      <para>New response parameters: storagecapabilities</para>
+    </listitem>
+  </itemizedlist>
+    </section>
+    
+  </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/db-ha.xml
----------------------------------------------------------------------
diff --git a/en-US/db-ha.xml b/en-US/db-ha.xml
index ace1c10..72fab64 100644
--- a/en-US/db-ha.xml
+++ b/en-US/db-ha.xml
@@ -21,28 +21,71 @@
  specific language governing permissions and limitations
  under the License.
 -->
-
 <section id="db-ha">
   <title>Database High Availability</title>
-  <para>To help ensure high availability of the databases that store the internal data for &PRODUCT;,
-    you can set up database replication.
-    This covers both the main &PRODUCT; database and the Usage database.
-    Replication is achieved using the MySQL connector parameters and two-way replication. Tested with MySQL 5.1 and 5.5.
-    </para>
+  <para>To help ensure high availability of the databases that store the internal data for
+    &PRODUCT;, you can set up database high availability. This covers both the main &PRODUCT;
+    database and the Usage database. High availability is achieved using the MySQL connector
+    parameters and two-way high availability. Tested with MySQL 5.1. </para>
   <section id="db-ha-howto">
-  <title>How to Set Up Database Replication</title>
-    <para>Database replication in &PRODUCT; is provided using the MySQL replication capabilities.
-    The steps to set up replication can be found in the MySQL documentation (links are provided below).
-    It is suggested that you set up two-way replication, which involves two database nodes.
-    In this case, for example, you might have node1 and node2.</para>
-    <para>You can also set up chain replication, which involves more than two nodes.
-    In this case, you would first set up two-way replication with node1 and node2.
-    Next, set up one-way replication from node2 to node3.
-    Then set up one-way replication from node3 to node4, and so on for all the additional nodes.</para>
+    <title>How to Set Up Database High Availability</title>
+    <para>Database high availability in &PRODUCT; is provided using the MySQL high availability
+      capabilities. The steps to set up high availability can be found in the MySQL documentation
+      (links are provided below). It is suggested that you set up two-way high availability, which
+      involves two database nodes. In this case, for example, you might have node1 and node2. In
+      Asynchronous high availability configuration, not more than two database nodes are supported. </para>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="./images/event-replica.png"/>
+      </imageobject>
+      <textobject>
+        <phrase>event-replica.png: high availability</phrase>
+      </textobject>
+    </mediaobject>
     <para>References:</para>
     <itemizedlist>
-      <listitem><para><ulink url="http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html">http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html</ulink></para></listitem>
-      <listitem><para><ulink url="https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server">https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server</ulink></para></listitem>
+      <listitem>
+        <para><ulink url="http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html"
+            >http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html</ulink></para>
+      </listitem>
+      <listitem>
+        <para><ulink
+            url="https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server"
+            >https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server</ulink></para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="dbha-consider">
+    <title>Database High Availability Considerations</title>
+    <itemizedlist>
+      <listitem>
+        <para>To clean up bin log files automatically, perform the following configuration in the
+            <filename>my.cnf</filename> file of each MySQL server:</para>
+        <para><property>expire_logs_days=10</property> : Number of days to keep the log
+          files.</para>
+        <para>
+          <property>max_binlog_size=100M</property>: The maximum size of each log file.</para>
+      </listitem>
+      <listitem>
+        <para>To change the bin log files location, use the
+            <property>log-bin=/var/lib/mysql/binlog/bin-log</property> property in the
+            <filename>my.cnf</filename> file of each MySQL server.</para>
+      </listitem>
+      <listitem>
+        <para>If two Management Servers happen to connect to two different database HA (split
+          brain), modify the following properties in db.properties of the slave: </para>
+        <itemizedlist>
+          <listitem>
+            <para><property>auto_increment_increment = 10</property>: Instruct the MySQL node to
+              auto increment values by 10 instead of default value 1.</para>
+          </listitem>
+          <listitem>
+            <para><property>auto_increment_offset = 2</property>: Instruct the MySQL node what is
+              the starting point of the auto increment column value to be start with. The second
+              property is relevant only when split brain occurs on a fresh setup.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
     </itemizedlist>
   </section>
   <section id="db-ha-configure">
@@ -52,39 +95,126 @@
     <para><emphasis role="bold">Required Settings</emphasis></para>
     <para>Be sure you have set the following in db.properties:</para>
     <itemizedlist>
-      <listitem><para>db.ha.enabled: set to true if you want to use the replication feature.</para>
-        <para>Example: db.ha.enabled=true</para></listitem>
-      <listitem><para>db.cloud.slaves: set to a comma-delimited set of slave hosts for the cloud database. This is the list of nodes set up with replication.
-        The master node is not in the list, since it is already mentioned elsewhere in the properties file.</para>
-        <para>Example: db.cloud.slaves=node2,node3,node4</para></listitem>
-      <listitem><para>db.usage.slaves: set to a comma-delimited set of slave hosts for the usage database. This is the list of nodes set up with replication.
-        The master node is not in the list, since it is already mentioned elsewhere in the properties file.</para>
-        <para>Example: db.usage.slaves=node2,node3,node4</para></listitem>
+      <listitem>
+        <para>db.ha.enabled: set to true if you want to use the high availability feature.</para>
+        <para>Example: db.ha.enabled=true</para>
+      </listitem>
+      <listitem>
+        <para>db.cloud.slaves: set to a comma-delimited set of slave hosts for the cloud database.
+          This is the list of nodes set up with high availability. The master node is not in the
+          list, since it is already mentioned elsewhere in the properties file.</para>
+        <para>Example: db.cloud.slaves=node2,node3,node4</para>
+      </listitem>
+      <listitem>
+        <para>db.usage.slaves: set to a comma-delimited set of slave hosts for the usage database.
+          This is the list of nodes set up with high availability. The master node is not in the
+          list, since it is already mentioned elsewhere in the properties file.</para>
+        <para>Example: db.usage.slaves=node2,node3,node4</para>
+      </listitem>
     </itemizedlist>
     <para><emphasis role="bold">Optional Settings</emphasis></para>
-    <para>The following settings must be present in db.properties, but you are not required to change the default values unless you wish to do so for tuning purposes:</para>
+    <para>The following settings must be present in db.properties, but you are not required to
+      change the default values unless you wish to do so for tuning purposes:</para>
     <itemizedlist>
-      <listitem><para>db.cloud.secondsBeforeRetryMaster: The number of seconds the MySQL connector should wait before trying again to connect to the master
-        after the master went down. Default is 1 hour.
-        The retry might happen sooner if db.cloud.queriesBeforeRetryMaster is reached first.</para>
-        <para>Example: db.cloud.secondsBeforeRetryMaster=3600</para></listitem>
-      <listitem><para>db.cloud.queriesBeforeRetryMaster: The minimum number of queries to be sent to the database before trying again to connect to the master
-        after the master went down. Default is 5000.
-        The retry might happen sooner if db.cloud.secondsBeforeRetryMaster is reached first.</para>
-        <para>Example: db.cloud.queriesBeforeRetryMaster=5000</para></listitem>
-      <listitem><para>db.cloud.initialTimeout: Initial time the MySQL connector should wait before trying again to connect to the master.
-        Default is 3600.</para>
-        <para>Example: db.cloud.initialTimeout=3600</para></listitem>
+      <listitem>
+        <para>db.cloud.secondsBeforeRetryMaster: The number of seconds the MySQL connector should
+          wait before trying again to connect to the master after the master went down. Default is 1
+          hour. The retry might happen sooner if db.cloud.queriesBeforeRetryMaster is reached
+          first.</para>
+        <para>Example: db.cloud.secondsBeforeRetryMaster=3600</para>
+      </listitem>
+      <listitem>
+        <para>db.cloud.queriesBeforeRetryMaster: The minimum number of queries to be sent to the
+          database before trying again to connect to the master after the master went down. Default
+          is 5000. The retry might happen sooner if db.cloud.secondsBeforeRetryMaster is reached
+          first.</para>
+        <para>Example: db.cloud.queriesBeforeRetryMaster=5000</para>
+      </listitem>
+      <listitem>
+        <para>db.cloud.initialTimeout: Initial time the MySQL connector should wait before trying
+          again to connect to the master. Default is 3600.</para>
+        <para>Example: db.cloud.initialTimeout=3600</para>
+      </listitem>
     </itemizedlist>
   </section>
+  <section id="aync-conf">
+    <title>Asynchronous Configuration for Database High Availability</title>
+    <para>The MySQL configuration to support DB HA in MySQL server is goes into the
+        <filename>/etc/my.cnf</filename> file and configuration slightly varies between master and
+      slave.</para>
+    <section id="master-conf">
+      <title>Master Configuration</title>
+      <programlisting>[mysqld]
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+# Settings user and group are ignored when systemd is used.
+# If you need to run mysqld under a different user or group,
+# customize your systemd unit file for mysqld according to the
+# instructions in http://fedoraproject.org/wiki/Systemd
+server-id=1
+default-storage-engine=InnoDB
+character-set-server=utf8
+transaction-isolation=READ-COMMITTED
+log-bin=mysql-bin
+innodb_flush_log_at_trx_commit=1
+sync_binlog=1
+binlog-format=ROW
+#Bin logs cleanup configuration
+expiry_logs_days=10
+max_binlog_size=100M
+
+[mysqld_safe]
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid</programlisting>
+    </section>
+    <section id="slave-conf">
+      <title>Slave Configuration</title>
+      <programlisting>[mysqld]
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+# Settings user and group are ignored when systemd is used.
+# If you need to run mysqld under a different user or group,
+# customize your systemd unit file for mysqld according to the
+# instructions in http://fedoraproject.org/wiki/Systemd
+server-id=2
+default-storage-engine = InnoDB
+character-set-server = utf8
+transaction-isolation = READ-COMMITTED
+log-bin=mysql-bin
+innodb_flush_log_at_trx_commit=1
+sync_binlog=1
+binlog-format=ROW
+#Parameters to solve split brain problem
+<emphasis role="bold">auto_increment_increment=10
+auto_increment_offset=2</emphasis>
+#Bin logs cleanup configuration
+expiry_logs_days=10
+max_binlog_size=100M
+[mysqld_safe]
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid</programlisting>
+    </section>
+  </section>
   <section id="db-ha-limitations">
     <title>Limitations on Database High Availability</title>
     <para>The following limitations exist in the current implementation of this feature.</para>
     <itemizedlist>
-      <listitem><para>Slave hosts can not be monitored through &PRODUCT;. You will need to have a separate means of monitoring.</para></listitem>
-      <listitem><para>Events from the database side are not integrated with the &PRODUCT; Management Server events system.</para></listitem>
-      <listitem><para>You must periodically perform manual clean-up of bin log files generated by replication on database nodes.
-        If you do not clean up the log files, the disk can become full.</para></listitem>
-    </itemizedlist>        
+      <listitem>
+        <para>Slave hosts can not be monitored through &PRODUCT;. You will need to have a separate
+          means of monitoring.</para>
+      </listitem>
+      <listitem>
+        <para>Events from the database side are not integrated with the &PRODUCT; Management Server
+          events system.</para>
+      </listitem>
+      <listitem>
+        <para>MySQL 5.1 supports only Asynchronous high availability; therefore, there is a chance
+          of data inconsistency while server is down. </para>
+      </listitem>
+    </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/ha-enabled-vm.xml
----------------------------------------------------------------------
diff --git a/en-US/ha-enabled-vm.xml b/en-US/ha-enabled-vm.xml
index 19666a4..a6a739f 100644
--- a/en-US/ha-enabled-vm.xml
+++ b/en-US/ha-enabled-vm.xml
@@ -1,29 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
-
 <!-- 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.
+  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.
 -->
-
 <section id="ha-enabled-vm">
     <title>HA-Enabled Virtual Machines</title>
-    <para>The user can specify a virtual machine as HA-enabled. By default, all virtual router VMs and Elastic Load Balancing VMs are automatically configured as HA-enabled. When an HA-enabled VM crashes, &PRODUCT; detects the crash and restarts the VM automatically within the same Availability Zone. HA is never performed across different Availability Zones. &PRODUCT; has a conservative policy towards restarting VMs and ensures that there will never be two instances of the same VM running at the same time. The Management Server attempts to start the VM on another Host in the same cluster.</para>
+    <para>The user can specify a virtual machine as HA-enabled. By default, all virtual router VMs and Elastic Load Balancing VMs are automatically configured as HA-enabled. When an HA-enabled VM crashes, CloudPlatform detects the crash and restarts the VM automatically within the same Availability Zone. HA is never performed across different Availability Zones. CloudPlatform has a conservative policy towards restarting VMs and ensures that there will never be two instances of the same VM running at the same time. The Management Server attempts to start the VM on another Host in the same cluster.</para>
     <para>HA features work with iSCSI or NFS primary storage.  HA with local storage is not supported.</para>
     </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/ha-for-hosts.xml
----------------------------------------------------------------------
diff --git a/en-US/ha-for-hosts.xml b/en-US/ha-for-hosts.xml
index 15b5fa7..3a6ea96 100644
--- a/en-US/ha-for-hosts.xml
+++ b/en-US/ha-for-hosts.xml
@@ -21,10 +21,33 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <section id="ha-for-hosts">
-    <title>HA for Hosts</title>
-    <para>The user can specify a virtual machine as HA-enabled. By default, all virtual router VMs and Elastic Load Balancing VMs are automatically configured as HA-enabled. When an HA-enabled VM crashes, &PRODUCT; detects the crash and restarts the VM automatically within the same Availability Zone. HA is never performed across different Availability Zones. &PRODUCT; has a conservative policy towards restarting VMs and ensures that there will never be two instances of the same VM running at the same time. The Management Server attempts to start the VM on another Host in the same cluster.</para>
-    <para>HA features work with iSCSI or NFS primary storage.  HA with local storage is not supported.</para>
-    <xi:include href="dedicated-ha-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <title>HA for Hosts</title>
+  <title>Dedicated HA Hosts</title>
+  <para>One or more hosts can be designated for use only by HA-enabled VMs that are restarting due
+    to a host failure. Setting up a pool of such dedicated HA hosts as the recovery destination for
+    all HA-enabled VMs is useful to:</para>
+  <itemizedlist>
+    <listitem>
+      <para>Make it easier to determine which VMs have been restarted as part of the CloudPlatform
+        high-availability function. If a VM is running on a dedicated HA host, then it must be an
+        HA-enabled VM whose original host failed. (With one exception: It is possible for an
+        administrator to manually migrate any VM to a dedicated HA host.).</para>
+    </listitem>
+    <listitem>
+      <para>Keep HA-enabled VMs from restarting on hosts which may be reserved for other
+        purposes.</para>
+    </listitem>
+  </itemizedlist>
+  <para>The dedicated HA option is set through a special host tag when the host is created. To allow
+    the administrator to dedicate hosts to only HA-enabled VMs, set the global configuration
+    variable ha.tag to the desired tag (for example, "ha_host"), and restart the Management Server.
+    Enter the value in the Host Tags field when adding the host(s) that you want to dedicate to
+    HA-enabled VMs.</para>
+  <note>
+    <para>If you set ha.tag, be sure to actually use that tag on at least one host in your cloud. If
+      the tag specified in ha.tag is not set for any host in the cloud, the HA-enabled VMs will fail
+      to restart after a crash.</para>
+  </note>
+  <para/>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/ha-management-server.xml
----------------------------------------------------------------------
diff --git a/en-US/ha-management-server.xml b/en-US/ha-management-server.xml
index 1afebce..3b9e229 100644
--- a/en-US/ha-management-server.xml
+++ b/en-US/ha-management-server.xml
@@ -1,30 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
-
 <!-- 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.
+  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.
 -->
-
 <section id="ha-management-server">
-    <title>HA for Management Server</title>
-    <para>The &PRODUCT; Management Server should be deployed in a multi-node configuration such that it is not susceptible to individual server failures. The Management Server itself (as distinct from the MySQL database) is stateless and may be placed behind a load balancer.</para>
-    <para>Normal operation of Hosts is not impacted by an outage of all Management Serves. All guest VMs will continue to work.</para>
-    <para>When the Management Server is down, no new VMs can be created, and the end user and admin UI, API, dynamic load distribution, and HA will cease to work.</para>
-   </section>
+  <title>HA for Management Server</title>
+  <para>The CloudPlatform Management Server should be deployed in a multi-node configuration such
+    that it is not susceptible to individual server failures. The Management Server itself (as
+    distinct from the MySQL database) is stateless and may be placed behind a load balancer.</para>
+  <para>Normal operation of Hosts is not impacted by an outage of all Management Serves. All guest
+    VMs will continue to work.</para>
+  <para>When the Management Server is down, no new VMs can be created, and the end user and admin
+    UI, API, dynamic load distribution, and HA will cease to work.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/images/event-replica.png
----------------------------------------------------------------------
diff --git a/en-US/images/event-replica.png b/en-US/images/event-replica.png
new file mode 100644
index 0000000..69640c3
Binary files /dev/null and b/en-US/images/event-replica.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/primary-storage-outage-and-data-loss.xml
----------------------------------------------------------------------
diff --git a/en-US/primary-storage-outage-and-data-loss.xml b/en-US/primary-storage-outage-and-data-loss.xml
index e68d1d9..ce9fdff 100644
--- a/en-US/primary-storage-outage-and-data-loss.xml
+++ b/en-US/primary-storage-outage-and-data-loss.xml
@@ -1,28 +1,37 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
-
 <!-- 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.
+  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.
 -->
-
 <section id="primary-storage-outage-and-data-loss">
-    <title>Primary Storage Outage and Data Loss</title>
-    <para>When a primary storage outage occurs the hypervisor immediately stops all VMs stored on that storage device. Guests that are marked for HA will be restarted as soon as practical when the primary storage comes back on line. With NFS, the hypervisor may allow the virtual machines to continue running depending on the nature of the issue. For example, an NFS hang will cause the guest VMs to be suspended until storage connectivity is restored.Primary storage is not designed to be backed up. Individual volumes in primary storage can be backed up using snapshots.</para>
-   </section>
+  <title>Primary Storage Outage and Data Loss</title>
+  <para>When a primary storage outage occurs, all hosts in that cluster are rebooted. This ensures
+    that affected VMs running on the hypervisor are appropriately marked as stopped. Guests that are
+    marked for HA will be restarted as soon as practical when the primary storage comes back on
+    line. With NFS, the hypervisor may allow the virtual machines to continue running depending on
+    the nature of the issue. For example, an NFS hang will cause the guest VMs to be suspended until
+    storage connectivity is restored. Primary storage is not designed to be backed up. Individual
+    volumes in primary storage can be backed up using snapshots.</para>
+  <note>
+    <para>If there are multiple primary storage servers in a cluster and only one goes down, VMs
+      using a healthy primary storage will also be affected, because all hosts are rebooted.</para>
+  </note>
+  <para/>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/secondary-storage-outage-and-data-loss.xml
----------------------------------------------------------------------
diff --git a/en-US/secondary-storage-outage-and-data-loss.xml b/en-US/secondary-storage-outage-and-data-loss.xml
index 42ab7d4..c2d8a9c 100644
--- a/en-US/secondary-storage-outage-and-data-loss.xml
+++ b/en-US/secondary-storage-outage-and-data-loss.xml
@@ -1,29 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
-
 <!-- 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.
+  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.
 -->
-
 <section id="secondary-storage-outage-and-data-loss">
     <title>Secondary Storage Outage and Data Loss</title>
     <para>For a Zone that has only one secondary storage server, a secondary storage outage will have feature level impact to the system but will not impact running guest VMs. It may become impossible to create a VM with the selected template for a user. A user may also not be able to save snapshots or examine/restore saved snapshots. These features will automatically be available when the secondary storage comes back online.</para>
-    <para>Secondary storage data loss will impact recently added user data including templates, snapshots, and ISO images. Secondary storage should be backed up periodically. Multiple secondary storage servers can be provisioned within each zone to increase the scalability of the system.</para>
-</section>
+    <para>Secondary storage data loss will impact recently added user data including templates, snapshots, and ISO images. Secondary storage should be backed up periodically.Multiple secondary storage servers can be provisioned within each zone to increase the scalability of the system.</para>
+   </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/sys-reliability-and-ha.xml
----------------------------------------------------------------------
diff --git a/en-US/sys-reliability-and-ha.xml b/en-US/sys-reliability-and-ha.xml
index ecba7d9..b54744f 100644
--- a/en-US/sys-reliability-and-ha.xml
+++ b/en-US/sys-reliability-and-ha.xml
@@ -21,16 +21,14 @@
     specific language governing permissions and limitations
     under the License.
 -->
+
 <chapter id="sys-reliability-and-ha">
-  <title>System Reliability and High Availability</title>
-  <xi:include href="ha-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-lb.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="ha-enabled-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="ha-for-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="primary-storage-outage-and-data-loss.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="secondary-storage-outage-and-data-loss.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="db-ha.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="api-throttling.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <title>System Reliability and High Availability</title>
+    <xi:include href="ha-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+    <xi:include href="ha-enabled-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+    <xi:include href="dedicated-ha-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="primary-storage-outage-and-data-loss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />     
+    <xi:include href="secondary-storage-outage-and-data-loss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+    <xi:include href="db-ha.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="api-throttling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ba37f20e/en-US/whats-new.xml
----------------------------------------------------------------------
diff --git a/en-US/whats-new.xml b/en-US/whats-new.xml
index 04733c7..d196db2 100644
--- a/en-US/whats-new.xml
+++ b/en-US/whats-new.xml
@@ -22,6 +22,11 @@
   <title>What's New in the API?</title>
   <para>The following describes any new major features of each &PRODUCT; version as it applies to
   API usage.</para>
+  <section id="whats-new-in-api-4.3">
+    <title>What's New in the API for 4.3</title>
+    <xi:include href="changed-API-commands-4.3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    
+  </section>
   <section id="whats-new-in-api-4.2">
     <title>What's New in the API for 4.2</title>
     <xi:include href="added-API-commands-4.2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>