Merge "[docs] Fixes to octavia-api docs"

This commit is contained in:
Jenkins 2016-06-07 21:38:43 +00:00 committed by Gerrit Code Review
commit 140cfca29b

View File

@ -790,8 +790,8 @@ Pools
| | | ``LEAST_CONNECTIONS``, \ | | | | ``LEAST_CONNECTIONS``, \ |
| | | ``SOURCE_IP``, ``ROUND_ROBIN`` | | | | ``SOURCE_IP``, ``ROUND_ROBIN`` |
+---------------------+---------------+------------------------------------+ +---------------------+---------------+------------------------------------+
| session_persistence | Session \ | Number of connections allowed at \ | | session_persistence | Session \ | JSON Session Persistence object \ |
| | Persistence \ | any given time | | | Persistence \ | (see below) |
| | Object | | | | Object | |
+---------------------+---------------+------------------------------------+ +---------------------+---------------+------------------------------------+
| name | String | String for pool name | | name | String | String for pool name |
@ -1062,7 +1062,7 @@ Health Monitors
| | | a health check fails | | | | a health check fails |
+----------------+---------+--------------------------------------+ +----------------+---------+--------------------------------------+
| fall_threshold | Integer | Number of health checks that can \ | | fall_threshold | Integer | Number of health checks that can \ |
| | | pass before the pool member is \ | | | | fail before the pool member is \ |
| | | moved from ``ONLINE`` to ``OFFLINE`` | | | | moved from ``ONLINE`` to ``OFFLINE`` |
+----------------+---------+--------------------------------------+ +----------------+---------+--------------------------------------+
| rise_threshold | Integer | Number of health checks that can \ | | rise_threshold | Integer | Number of health checks that can \ |