Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: pdion891@apache.org
To: commits@cloudstack.apache.org
Message-Id: <4fa9f50a08d54ac59e614988aa589bb7@git.apache.org>
Subject: git commit: revert compat.rst as similar to 4.3
Date: Wed, 23 Jul 2014 02:38:10 +0000 (UTC)

Repository: cloudstack-docs-rn
Updated Branches:
  refs/heads/4.4.0 6fa635c48 -> 3056c96f5


revert compat.rst as similar to 4.3


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

Branch: refs/heads/4.4.0
Commit: 3056c96f5a7df4b5df3a510fda4a919aeb2d14d6
Parents: 6fa635c
Author: pdion891 <pdion891@apache.org>
Authored: Tue Jul 22 22:37:08 2014 -0400
Committer: pdion891 <pdion891@apache.org>
Committed: Tue Jul 22 22:37:08 2014 -0400

----------------------------------------------------------------------
 source/compat.rst | 70 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/3056c96f/source/compat.rst
----------------------------------------------------------------------
diff --git a/source/compat.rst b/source/compat.rst
index 9936583..f338a20 100644
--- a/source/compat.rst
+++ b/source/compat.rst
@@ -12,51 +12,69 @@
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
    under the License.
-
-
+   
 Compatibility Matrix
 ====================
 
 Supported OS Versions for Management Server
 -------------------------------------------
 
-This section describes the operating systems, browsers, and hypervisors
-that have been newly tested and certified compatible with CloudStack
-|release|. Most earlier OS and hypervisor versions are also still supported
-for use with |release|. It might work well on other platforms, but the
-platforms listed below are the ones that are specifically tested against
-and are more likely to be able to help troubleshoot if you run into any
-issues.
+This section lists the operating systems that are supported for running
+CloudStack Management Server. Note that specific versions of the
+operating systems are tested, so compatibility with CentOS 6.3 may not
+indicate compatibility with CentOS 6.2, 6.1 and so on.
 
-.. note:: 
-   That specific versions of the operating systems are tested, so 
-   compatibility with CentOS 6.3 may not indicate compatibility with CentOS 
-   6.2, 6.1 and so on.
+-  RHEL versions 5.5, 6.2, 6.3, and 6.4
 
--  CentOS versions 6.5 (32 and 64 bit)
+-  CentOS versions 6.3, 6.4 and 6.5
 
--  FreeBSD 10 (32 and 64 bit)
+-  Ubuntu 12.04 LTS
 
--  Microsoft Winows 8.1 (32 and 64 bit)
+Supported Hypervisor Versions
+-----------------------------
 
--  Windows XP SP3 (32 and 64 bit)
+CloudStack supports three hypervisor families, XenServer with XAPI, KVM,
+and VMware with vSphere.
 
+-  Windows Server 2012 R2 (with Hyper-V Role enabled)
 
-Supported Hypervisor Versions
------------------------------
+-  Hyper-V 2012 R2
+
+-  CentOS 6.2 with KVM
+
+-  Red Hat Enterprise Linux 6.2 with KVM
+
+-  XenServer 6.0.2 (with Hotfix)
 
-No new supported hypervisors in |release|.
+-  XenServer versions 6.1 and 6.2 SPI with latest hotfixes
 
-For more information, see the Hypervisor Compatibility Matrix in the 
-`CloudStack Installation Guide`_.
+-  VMware versions 5.0, 5.1, and 5.5
+
+-  Bare metal hosts are supported, which have no hypervisor. These hosts
+   can run the following operating systems:
+
+   -  RHEL or CentOS, v6.2 or 6.3
+
+      .. note:: Use libvirt version 0.9.10 for CentOS 6.3
+
+   -  Fedora 17
+
+   -  Ubuntu 12.04
+
+For more information, see the Hypervisor Compatibility Matrix in the
+CloudStack Installation Guide.
 
 
 Supported External Devices
 --------------------------
 
-No new supported External Devices in |release|.
+-  Netscaler VPX and MPX versions 9.3 and 10.e
+
+-  Netscaler SDX version 9.3
 
-For more information, see the `CloudStack Installation Guide`_.
+-  SRX (Model srx100b) versions 10.3 or higher
+
+-  F5 10.1.0 (Build 3341.1084)
 
 
 Supported Browsers
@@ -73,6 +91,4 @@ best results, one of the following browsers recommended:
 
 -  Google Chrome version 31
 
--  Safari 5
-
-.. include:: global.rst
+-  Safari 5
\ No newline at end of file