Merge branch 'balder/update-attributes' of github.com:vespa-engine/vespa into balder/update-attributes

1 files changed, 58 insertions, 61 deletions

diff --git a/config-model/src/test/derived/multiplesummaries/index-info.cfg b/config-model/src/test/derived/multiplesummaries/index-info.cfg
index 5ad04f6c9f2..ec2d3f06e46 100644
--- a/config-model/src/test/derived/multiplesummaries/index-info.cfg
+++ b/config-model/src/test/derived/multiplesummaries/index-info.cfg
@@ -1,62 +1,59 @@
-indexinfo[1]
 indexinfo[multiplesummaries].name "multiplesummaries"
-indexinfo[multiplesummaries].alias[0]
-indexinfo[multiplesummaries].command[29]
-indexinfo[multiplesummaries].command[00].command "index"
-indexinfo[multiplesummaries].command[00].indexname "sddocname"
-indexinfo[multiplesummaries].command[01].command "word"
-indexinfo[multiplesummaries].command[01].indexname "sddocname"
-indexinfo[multiplesummaries].command[02].command "index"
-indexinfo[multiplesummaries].command[02].indexname "a"
-indexinfo[multiplesummaries].command[03].command "attribute"
-indexinfo[multiplesummaries].command[03].indexname "a"
-indexinfo[multiplesummaries].command[04].command "index"
-indexinfo[multiplesummaries].command[04].indexname "adynamic"
-indexinfo[multiplesummaries].command[05].command "attribute"
-indexinfo[multiplesummaries].command[05].indexname "adynamic"
-indexinfo[multiplesummaries].command[06].command "index"
-indexinfo[multiplesummaries].command[06].indexname "abolded"
-indexinfo[multiplesummaries].command[07].command "attribute"
-indexinfo[multiplesummaries].command[07].indexname "abolded"
-indexinfo[multiplesummaries].command[08].command "index"
-indexinfo[multiplesummaries].command[08].indexname "b"
-indexinfo[multiplesummaries].command[09].command "index"
-indexinfo[multiplesummaries].command[09].indexname "c"
-indexinfo[multiplesummaries].command[10].command "attribute"
-indexinfo[multiplesummaries].command[10].indexname "c"
-indexinfo[multiplesummaries].command[11].command "index"
-indexinfo[multiplesummaries].command[11].indexname "d"
-indexinfo[multiplesummaries].command[12].command "index"
-indexinfo[multiplesummaries].command[12].indexname "e"
-indexinfo[multiplesummaries].command[13].command "index"
-indexinfo[multiplesummaries].command[13].indexname "f"
-indexinfo[multiplesummaries].command[14].command "index"
-indexinfo[multiplesummaries].command[14].indexname "g"
-indexinfo[multiplesummaries].command[15].command "index"
-indexinfo[multiplesummaries].command[15].indexname "h"
-indexinfo[multiplesummaries].command[16].command "index"
-indexinfo[multiplesummaries].command[16].indexname "loc"
-indexinfo[multiplesummaries].command[17].command "default-position"
-indexinfo[multiplesummaries].command[17].indexname "loc_pos"
-indexinfo[multiplesummaries].command[18].command "index"
-indexinfo[multiplesummaries].command[18].indexname "loc_pos"
-indexinfo[multiplesummaries].command[19].command "index"
-indexinfo[multiplesummaries].command[19].indexname "loc_pos_zcurve"
-indexinfo[multiplesummaries].command[20].command "attribute"
-indexinfo[multiplesummaries].command[20].indexname "loc_pos_zcurve"
-indexinfo[multiplesummaries].command[21].command "dynteaser"
-indexinfo[multiplesummaries].command[21].indexname "adynamic"
-indexinfo[multiplesummaries].command[22].command "highlight"
-indexinfo[multiplesummaries].command[22].indexname "d"
-indexinfo[multiplesummaries].command[23].command "dynteaser"
-indexinfo[multiplesummaries].command[23].indexname "adynamic2"
-indexinfo[multiplesummaries].command[24].command "highlight"
-indexinfo[multiplesummaries].command[24].indexname "abolded2"
-indexinfo[multiplesummaries].command[25].command "dynteaser"
-indexinfo[multiplesummaries].command[25].indexname "aboldeddynamic"
-indexinfo[multiplesummaries].command[26].command "highlight"
-indexinfo[multiplesummaries].command[26].indexname "aboldeddynamic"
-indexinfo[multiplesummaries].command[27].command "highlight"
-indexinfo[multiplesummaries].command[27].indexname "abolded"
-indexinfo[multiplesummaries].command[28].command "dynteaser"
-indexinfo[multiplesummaries].command[28].indexname "dynamice"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "sddocname"
+indexinfo[multiplesummaries].command[].command "word"
+indexinfo[multiplesummaries].command[].indexname "sddocname"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "a"
+indexinfo[multiplesummaries].command[].command "attribute"
+indexinfo[multiplesummaries].command[].indexname "a"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "adynamic"
+indexinfo[multiplesummaries].command[].command "attribute"
+indexinfo[multiplesummaries].command[].indexname "adynamic"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "abolded"
+indexinfo[multiplesummaries].command[].command "attribute"
+indexinfo[multiplesummaries].command[].indexname "abolded"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "b"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "c"
+indexinfo[multiplesummaries].command[].command "attribute"
+indexinfo[multiplesummaries].command[].indexname "c"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "d"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "e"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "f"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "g"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "h"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "loc"
+indexinfo[multiplesummaries].command[].command "default-position"
+indexinfo[multiplesummaries].command[].indexname "loc_pos"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "loc_pos"
+indexinfo[multiplesummaries].command[].command "index"
+indexinfo[multiplesummaries].command[].indexname "loc_pos_zcurve"
+indexinfo[multiplesummaries].command[].command "attribute"
+indexinfo[multiplesummaries].command[].indexname "loc_pos_zcurve"
+indexinfo[multiplesummaries].command[].command "dynteaser"
+indexinfo[multiplesummaries].command[].indexname "adynamic"
+indexinfo[multiplesummaries].command[].command "highlight"
+indexinfo[multiplesummaries].command[].indexname "d"
+indexinfo[multiplesummaries].command[].command "dynteaser"
+indexinfo[multiplesummaries].command[].indexname "adynamic2"
+indexinfo[multiplesummaries].command[].command "highlight"
+indexinfo[multiplesummaries].command[].indexname "abolded2"
+indexinfo[multiplesummaries].command[].command "dynteaser"
+indexinfo[multiplesummaries].command[].indexname "aboldeddynamic"
+indexinfo[multiplesummaries].command[].command "highlight"
+indexinfo[multiplesummaries].command[].indexname "aboldeddynamic"
+indexinfo[multiplesummaries].command[].command "highlight"
+indexinfo[multiplesummaries].command[].indexname "abolded"
+indexinfo[multiplesummaries].command[].command "dynteaser"
+indexinfo[multiplesummaries].command[].indexname "dynamice"