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

This commit is contained in:
2018-05-15 13:57:45 +02:00

View File

@ -149,7 +149,7 @@
<target type='variable'>rdClMemberSlavePort</target>
<target type='variable'>rdClMemberSlaveRole</target>
<target type='variable'>rdClMemberSlaveMaster</target>
<target type='variable'>rdClMemberSlaveMaster</target>
<target type='variable'>redisSlaveInstanceMaster</target>
</condition>
<condition name='disabled_if_in' source='rdClMemberRole'>