summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-11-15 08:45:54 +0100
committerHarald Musum <musum@oath.com>2017-11-15 08:45:54 +0100
commit35df0817bcfaea0754a94c14be7e5b9303b80610 (patch)
treef47ddd9bd82f1a67c43e92947ee18fca63082846 /config-model
parentdea483613029d3975c433ebc717b6ee66fddf80a (diff)
Remove support for minSlobroksPerCluster
Undocumented, not used by any applications in a long time
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/resources/schema/admin.rnc3
-rw-r--r--config-model/src/test/schema-test-files/services-hosted.xml1
-rw-r--r--config-model/src/test/schema-test-files/services.xml1
3 files changed, 0 insertions, 5 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc
index a88109663eb..b7ec252c4d7 100644
--- a/config-model/src/main/resources/schema/admin.rnc
+++ b/config-model/src/main/resources/schema/admin.rnc
@@ -5,7 +5,6 @@ AdminV2 =
element admin {
attribute version { "2.0" } &
element adminserver { service.attlist } &
- element minSlobroksPerCluster { xsd:positiveInteger }? & # TODO: Remove when no applications use this
GenericConfig* &
LogServer? &
(ConfigServer | ConfigServers)? &
@@ -20,7 +19,6 @@ AdminV2 =
AdminV3 =
element admin {
attribute version { "3.0" } &
- element minSlobroksPerCluster { xsd:positiveInteger }? & # TODO: Remove when no applications use this
GenericConfig* &
Nodes
}
@@ -28,7 +26,6 @@ AdminV3 =
AdminV4 =
element admin {
attribute version { "4.0" } &
- element minSlobroksPerCluster { xsd:positiveInteger }? & # TODO: Remove when no applications use this
AdminV4Slobroks? &
AdminV4LogServers? &
GenericConfig* &
diff --git a/config-model/src/test/schema-test-files/services-hosted.xml b/config-model/src/test/schema-test-files/services-hosted.xml
index aee208088b7..90894aa253b 100644
--- a/config-model/src/test/schema-test-files/services-hosted.xml
+++ b/config-model/src/test/schema-test-files/services-hosted.xml
@@ -4,7 +4,6 @@
<admin version="3.0">
<nodes count="3" flavor="small"/>
- <minSlobroksPerCluster>1</minSlobroksPerCluster>
</admin>
<jdisc id="container1" version="1.0">
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 380ce7f5a3d..18468dcc433 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -7,7 +7,6 @@
</config>
<admin version="2.0">
- <minSlobroksPerCluster>1</minSlobroksPerCluster>
<adminserver hostalias="adminserver" />
<logserver hostalias="logserver" />
<slobroks>