Skip to content

G
gitlab-ce
Commit c736944d authored by Brett Walker's avatar Brett Walker
Browse files
Options

fix incorrect markdown

parent 149b0c49
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
doc/administration/high_availability/redis.md
View file @ c736944d
...@@ -54,19 +54,11 @@ components below. ...@@ -54,19 +54,11 @@ components below.
### High Availability with Sentinel ### High Availability with Sentinel
<<<<<<< HEAD
>**Notes:**
- Starting with GitLab 8.11, you can configure a list of Redis Sentinel
servers that will monitor a group of Redis servers to provide failover support.
- Starting with GitLab 8.14, the Omnibus GitLab Enterprise Edition package
comes with Redis Sentinel daemon built-in.
=======
> **Notes:** > **Notes:**
> - Starting with GitLab `8.11`, you can configure a list of Redis Sentinel > - Starting with GitLab `8.11`, you can configure a list of Redis Sentinel
> servers that will monitor a group of Redis servers to provide failover support. > servers that will monitor a group of Redis servers to provide failover support.
> - Starting with GitLab `8.14`, the Omnibus GitLab Enterprise Edition package > - Starting with GitLab `8.14`, the Omnibus GitLab Enterprise Edition package
> comes with Redis Sentinel daemon built-in. > comes with Redis Sentinel daemon built-in.
>>>>>>> upstream/master
High Availability with Redis requires a few things: High Availability with Redis requires a few things:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7