This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git
The following commit(s) were added to refs/heads/master by this push:
new 2a2c0fa fix table width and remove unicode symbol
2a2c0fa is described below
commit 2a2c0fa1bd25d7592b9fdd124362e7718931fffa
Author: Paul Angus <paul.an...@shapeblue.com>
AuthorDate: Wed Nov 21 10:25:42 2018 +0000
fix table width and remove unicode symbol
---
.../choosing_deployment_architecture.rst | 62 +++++++++++-----------
source/conceptsandterminology/network_setup.rst | 2 +-
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/source/conceptsandterminology/choosing_deployment_architecture.rst
b/source/conceptsandterminology/choosing_deployment_architecture.rst
index a218193..7e7e534 100644
--- a/source/conceptsandterminology/choosing_deployment_architecture.rst
+++ b/source/conceptsandterminology/choosing_deployment_architecture.rst
@@ -165,36 +165,38 @@ supported by CloudStack. The following table provides
this information.
.. cssclass:: table-striped table-bordered table-hover
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Feature | XenServer | vSphere | KVM - RHEL |
LXC | HyperV | Bare Metal |
-+==================================+===========+==============+============+=====+========+============+
-| Network Throttling | Yes | Yes | Yes |
No | ? | N/A |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Security groups in zones that use| Yes | No | Yes |
Yes | ? | No |
-| basic networking | | | |
| | |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| iSCSI | Yes | Yes | Yes |
Yes | Yes | N/A |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| FibreChannel | Yes | Yes | Yes |
Yes | Yes | N/A |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Local Disk | Yes | Yes | Yes |
Yes | Yes | Yes |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| HA | Yes | Yes (Native) | Yes | ?
| Yes | N/A |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Snapshots of local disk | Yes | Yes | Yes | ?
| ? | N/A |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Local disk as data disk | Yes | No | Yes |
Yes | Yes | N/A |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Work load balancing | No | DRS | No |
No | ? | N/A |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Manual live migration of VMs from| Yes | Yes | Yes | ?
| Yes | N/A |
-| host to host | | | |
| | |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
-| Conserve management traffic IP | Yes | No | Yes |
Yes | ? | N/A |
-| address by using link local | | | |
| | |
-| network to communicate with | | | |
| | |
-| virtual router | | | |
| | |
-+----------------------------------+-----------+--------------+------------+-----+--------+------------+
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Feature | XenServer | vSphere | KVM | LXC |
HyperV | Bare |
+| | | | (RHEL) | |
| Metal |
++==================================+===========+==========+========+=====+========+=======+
+| Network Throttling | Yes | Yes | Yes | No | ?
| N/A |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Security groups in zones that use| Yes | No | Yes | Yes | ?
| No |
+| basic networking | | | | |
| |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| iSCSI | Yes | Yes | Yes | Yes | Yes
| N/A |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| FibreChannel | Yes | Yes | Yes | Yes | Yes
| N/A |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Local Disk | Yes | Yes | Yes | Yes | Yes
| Yes |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| HA | Yes | Yes | Yes | ? | Yes
| N/A |
+| | | (Native) | | |
| |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Snapshots of local disk | Yes | Yes | Yes | ? | ?
| N/A |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Local disk as data disk | Yes | No | Yes | Yes | Yes
| N/A |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Work load balancing | No | DRS | No | No | ?
| N/A |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Manual live migration of VMs from| Yes | Yes | Yes | ? | Yes
| N/A |
+| host to host | | | | |
| |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
+| Conserve management traffic IP | Yes | No | Yes | Yes | ?
| N/A |
+| address by using link local | | | | |
| |
+| network to communicate with | | | | |
| |
+| virtual router | | | | |
| |
++----------------------------------+-----------+----------+--------+-----+--------+-------+
Hypervisor Support for Primary Storage
diff --git a/source/conceptsandterminology/network_setup.rst
b/source/conceptsandterminology/network_setup.rst
index 08ddf5e..b8f0c47 100644
--- a/source/conceptsandterminology/network_setup.rst
+++ b/source/conceptsandterminology/network_setup.rst
@@ -968,7 +968,7 @@ CloudStack’s integration with inMon Traffic Sentinel.
Traffic Sentinel is a network traffic usage data collection package.
CloudStack can feed statistics from Traffic Sentinel into its own usage
records, providing a basis for billing users of cloud infrastructure.
-Traffic Sentinel uses the traffic monitoring protocol sFlow. Routers
+Traffic Sentinel uses the traffic monitoring protocol sFlow. Routers
and switches generate sFlow records and provide them for collection by
Traffic Sentinel, then CloudStack queries the Traffic Sentinel database
to obtain this information
