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

This commit is contained in:
Philippe Caseiro 2018-05-17 10:17:21 +02:00
commit 98bfcc1416
1 changed files with 0 additions and 7 deletions

View File

@ -198,13 +198,6 @@
<target type='variable'>dbSlowQueryLogTime</target> <target type='variable'>dbSlowQueryLogTime</target>
<target type='variable'>dbSlowQueryLogFile</target> <target type='variable'>dbSlowQueryLogFile</target>
</condition> </condition>
<condition name='disabled_if_in' source="dbClusterPosition">
<param>Node</param>
<target type='variable'>accName</target>
<target type='variable'>accLimits</target>
<target type='variable'>accLimitTarget</target>
</condition>
</constraints> </constraints>
<help/> <help/>
</creole> </creole>