Merge branch 'master' into hakonhall/define-enable-logserver-flag

4 files changed, 4 insertions, 16 deletions

diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml
index 487c43ed3b3..97aa75ee90b 100644
--- a/configdefinitions/pom.xml
+++ b/configdefinitions/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.yahoo.vespa</groupId>
     <artifactId>parent</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>configdefinitions</artifactId>
   <packaging>container-plugin</packaging>
-  <version>6-SNAPSHOT</version>
+  <version>7-SNAPSHOT</version>
   <name>configdefinitions</name>
   <dependencies>
     <dependency>
diff --git a/configdefinitions/src/vespa/imported-fields.def b/configdefinitions/src/vespa/imported-fields.def
index 051226f1615..0947ff63e2a 100644
--- a/configdefinitions/src/vespa/imported-fields.def
+++ b/configdefinitions/src/vespa/imported-fields.def
@@ -9,12 +9,3 @@ attribute[].referencefield string
 
 # The name of the target attribute field in the parent document type that is imported into this document type.
 attribute[].targetfield string
-
-# Deprecated. TODO: Remove when going to Vespa 7.
-# The data type of the target attribute field. This enum should match the one in attributes.def.
-attribute[].datatype enum { STRING, UINT1, UINT2, UINT4, INT8, INT16, INT32, INT64, FLOAT, DOUBLE, PREDICATE, TENSOR, REFERENCE, NONE } default=NONE
-
-# Deprecated. TODO: Remove when going to Vespa 7.
-# The collection type of the target attribute field. This enum should match the one in attributes.def.
-attribute[].collectiontype enum { SINGLE, ARRAY, WEIGHTEDSET } default=SINGLE
-
diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/indexschema.def
index 5352e4d9009..7153164bfab 100644
--- a/configdefinitions/src/vespa/indexschema.def
+++ b/configdefinitions/src/vespa/indexschema.def
@@ -4,10 +4,8 @@ namespace=vespa.config.search
 
 ## The name of the index field.
 indexfield[].name string
-## This is the type of an index. Currently only rise and vespa are supported
-indexfield[].indextype enum {VESPA, RISE} default=VESPA
 ## The data type of the index field.
-indexfield[].datatype enum { STRING, INT64, BOOLEANTREE } default=STRING
+indexfield[].datatype enum { STRING, INT64 } default=STRING
 ## The collection type of the index field.
 indexfield[].collectiontype enum { SINGLE, ARRAY, WEIGHTEDSET } default=SINGLE
 ## Whether the index should support prefix searches.
diff --git a/configdefinitions/src/vespa/slobroks.def b/configdefinitions/src/vespa/slobroks.def
index 2dd17b307e1..b4e5536d2df 100644
--- a/configdefinitions/src/vespa/slobroks.def
+++ b/configdefinitions/src/vespa/slobroks.def
@@ -2,8 +2,7 @@
 namespace=cloud.config
 
 ### All params must be flagged as 'restart' because this config is manually
-### retrieved by ConfiguredApplication.start to init the rpc server in
-### com.yahoo.container.Server.
+### retrieved by ConfiguredApplication.start to init the rpc server
 
 ## The connectionspec for a slobrok is used for connecting to it using
 ## the FNET Remote Tools framework.  It is normally on the form