diff options
author | gjoranv <gjoranv@gmail.com> | 2017-04-18 14:24:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-18 14:24:37 +0200 |
commit | a50de75c1a009986b0193abcbb2d9a5f42d9c607 (patch) | |
tree | ac35d4473b05f98547d06f0f29d96344fa29dd91 /configserver | |
parent | 4da516e6afbac36f1c80d5e28a491748751ffff0 (diff) | |
parent | c4cd52da26a2b87ae15bc309d882c1435a7535fa (diff) |
Merge pull request #2174 from yahoo/hmusum/remove-searchdefinitions-syntax
Remove unused apps and fix no longer valid <searchdefinitions> in ser…
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/test/apps/zkapp/services.xml | 61 |
1 files changed, 16 insertions, 45 deletions
diff --git a/configserver/src/test/apps/zkapp/services.xml b/configserver/src/test/apps/zkapp/services.xml index aee18cc450a..9549bc2d063 100644 --- a/configserver/src/test/apps/zkapp/services.xml +++ b/configserver/src/test/apps/zkapp/services.xml @@ -10,51 +10,22 @@ </slobroks> </admin> - <clients version="2.0"> - <gateways protocols="http"> - <gateway hostalias="node1" /> - </gateways> - </clients> + <jdisc version="1.0"> + <documentapi/> + <search/> + <nodes> + <node hostalias="node1"/> + </nodes> + </jdisc> - <search version="2.0"> - <qrservers> - <qrserver hostalias="node1" /> - </qrservers> - <cluster name="music" indexingmode="realtime"> - <searchdefinitions> - <searchdefinition name="music" /> - </searchdefinitions> - <clustercontrollers> - <clustercontroller hostalias="node1" /> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1" /> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0" /> - </searchnodes> - </row> - </cluster> - </search> - - <storage version="3.0"> - <cluster redundancy="1"> -<!-- -Do not reshuffle nodes or change index values - this will cause -massive document redistribution. - -If you want to discontinue use of a node, set it in the 'retired' state, -this will rebalance the documents out of the node. Once node is empty, -you can stop it and delete the reference to it in vespa-services and -vespa-hosts files. ---> - <group index="0" name="mycluster"> - <node hostalias="node1" index="0"/> - </group> - - <fleetcontroller hostalias="node1" /> - </cluster> - </storage> + <content version="1.0"> + <redundancy>1</redundancy> + <documents> + <document name="music" mode="index"/> + </documents> + <nodes> + <node hostalias="node1" distribution-key="0"/> + </nodes> + </content> </services> |