[master] 57cacb2 Fields type and ident are gone from varnishstat

[Federico G. Schwindt]

commit 57cacb273cfca256f66e015671af42b01146c054
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Aug 7 13:35:41 2017 +0100

    Fields type and ident are gone from varnishstat
    
    Fixes #2377.

diff --git a/bin/varnishstat/varnishstat.xsd b/bin/varnishstat/varnishstat.xsd
index f5f14aa..aaef80f 100644
--- a/bin/varnishstat/varnishstat.xsd
+++ b/bin/varnishstat/varnishstat.xsd
@@ -6,10 +6,6 @@
 		<xs:element name="stat" maxOccurs="unbounded">
 		    <xs:complexType>
 			<xs:sequence>
-			    <xs:element name="type" type="xs:string"
-					minOccurs="0" maxOccurs="1"/>
-			    <xs:element name="ident" type="xs:string"
-					minOccurs="0" maxOccurs="1"/>
 			    <xs:element name="name" type="xs:string"/>
 			    <xs:element name="value" type="xs:integer"/>
 			    <xs:element name="flag" type="xs:string"/>
diff --git a/doc/sphinx/reference/varnishstat.rst b/doc/sphinx/reference/varnishstat.rst
index 09bab41..89f1f27 100644
--- a/doc/sphinx/reference/varnishstat.rst
+++ b/doc/sphinx/reference/varnishstat.rst
@@ -116,8 +116,6 @@ The XML output format is::
 
   <varnishstat timestamp="YYYY-MM-DDTHH:mm:SS">
     <stat>
-      <type>FIELD TYPE</type>
-      <ident>FIELD IDENT</ident>
       <name>FIELD NAME</name>
       <value>FIELD VALUE</value>
       <flag>FIELD SEMANTICS</flag>
@@ -133,20 +131,19 @@ The JSON output format is::
     "timestamp": "YYYY-MM-DDTHH:mm:SS",
     "FIELD NAME": {
       "description": "FIELD DESCRIPTION",
-      "type": "FIELD TYPE", "ident": "FIELD IDENT", "flag": "FIELD SEMANTICS", "format": "FIELD DISPLAY FORMAT",
+      "flag": "FIELD SEMANTICS", "format": "FIELD DISPLAY FORMAT",
       "value": FIELD VALUE
     },
     "FIELD NAME": {
       "description": "FIELD DESCRIPTION",
-      "type": "FIELD TYPE", "ident": "FIELD IDENT", "flag": "FIELD SEMANTICS", "format": "FIELD DISPLAY FORMAT",
+      "flag": "FIELD SEMANTICS", "format": "FIELD DISPLAY FORMAT",
       "value": FIELD VALUE
     },
     [..]
   }
 
 
-Type and ident are optional.  Timestamp is the time when the report was
-generated by varnishstat.
+Timestamp is the time when the report was generated by varnishstat.
 
 
 SEE ALSO