Merge "Flavor id is not a uuid, it's a int."

This commit is contained in:
Jenkins 2016-01-19 03:20:58 +00:00 committed by Gerrit Code Review
commit 744f244414
2 changed files with 4 additions and 4 deletions

View File

@ -208,13 +208,13 @@
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY flavor_idTemplateParameter ' <!ENTITY flavor_idTemplateParameter '
<param name="flavor_id" style="template" type="csapi:UUID" <param name="flavor_id" style="template" type="xsd:int"
xmlns="http://wadl.dev.java.net/2009/02"> xmlns="http://wadl.dev.java.net/2009/02">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN" xml:lang="EN"
xmlns:wadl="http://wadl.dev.java.net/2009/02"> xmlns:wadl="http://wadl.dev.java.net/2009/02">
<para> <para>
The UUID of the flavor. The ID of the flavor.
</para> </para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>

View File

@ -67,12 +67,12 @@
<any namespace="##other" processContents="lax" minOccurs="0" <any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/> maxOccurs="unbounded"/>
</sequence> </sequence>
<attribute type="csapi:UUID" name="id" use="required"> <attribute type="xsd:int" name="id" use="required">
<annotation> <annotation>
<xsd:documentation xml:lang="EN" <xsd:documentation xml:lang="EN"
xmlns="http://www.w3.org/1999/xhtml"> xmlns="http://www.w3.org/1999/xhtml">
<p> <p>
The UUID of the flavor. The ID of the flavor.
</p> </p>
</xsd:documentation> </xsd:documentation>
</annotation> </annotation>