Commit fe7f7bd0 authored by Michał Glinka's avatar Michał Glinka

Merge branch 'rc' into devel

parents 181521dc 311b521b
......@@ -90,6 +90,13 @@
<xs:attributeGroup name="attlist.device">
<xs:attribute name="daemon" use="required"/>
<xs:attribute name="path"/>
<xs:attribute name="tags">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:pattern value="[\+-][A-Za-z]+(,[\+-][A-Za-z]+)*"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="speed" type="xs:integer"/>
<xs:attribute name="parcook_device"/>
<xs:attribute name="sec_period" type="xs:integer"/>
......@@ -178,6 +185,13 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.unit">
<xs:attribute name="tags">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:pattern value="[\+-][A-Za-z]+(,[\+-][A-Za-z]+)*"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="id" use="required"/>
<xs:attribute name="type" use="required" type="xs:integer"/>
<xs:attribute name="subtype" use="required" type="xs:integer"/>
......@@ -274,6 +288,13 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="tags">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:pattern value="[\+-][A-Za-z]+(,[\+-][A-Za-z]+)*"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="forbidden"/>
<xs:attribute name="ip_addr"/>
<xs:attribute name="data_type">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment