Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
Philippe Caseiro 2018-06-25 22:21:09 +02:00
commit a85ec92831
3 changed files with 5 additions and 2 deletions

View File

@ -87,6 +87,9 @@
<variable name='rdClMemberSlaveMaster' type='string' description="Noeud du noeud répliquer sur cette instance secondaire"/> <variable name='rdClMemberSlaveMaster' type='string' description="Noeud du noeud répliquer sur cette instance secondaire"/>
</family> </family>
<family name='Redis tunning' mode='expert'> <family name='Redis tunning' mode='expert'>
<variable name='redixMaxClients' type='number' description="Maximum allowed clients">
<value>10000</value>
</variable>
<variable name='rdCliOutBuffHardLimit' type='number' description="Client output buffer hard limit (for slave)"> <variable name='rdCliOutBuffHardLimit' type='number' description="Client output buffer hard limit (for slave)">
<value>512</value> <value>512</value>
</variable> </variable>

View File

@ -291,7 +291,7 @@ dir /var/lib/redis
# Once the limit is reached Redis will close all the new connections sending # Once the limit is reached Redis will close all the new connections sending
# an error 'max number of clients reached'. # an error 'max number of clients reached'.
# #
# maxclients 10000 maxclients %%redisMaxClients
# Don't use more memory than the specified amount of bytes. # Don't use more memory than the specified amount of bytes.
# When the memory limit is reached Redis will try to remove keys # When the memory limit is reached Redis will try to remove keys

View File

@ -295,7 +295,7 @@ dir /var/lib/redis
# Once the limit is reached Redis will close all the new connections sending # Once the limit is reached Redis will close all the new connections sending
# an error 'max number of clients reached'. # an error 'max number of clients reached'.
# #
# maxclients 10000 maxclients %%redisMaxClients
# Don't use more memory than the specified amount of bytes. # Don't use more memory than the specified amount of bytes.
# When the memory limit is reached Redis will try to remove keys # When the memory limit is reached Redis will try to remove keys