From: Jonathan Rajotte Julien <jonathan.r.julien@gmail.com>
Date: Fri, 25 Jul 2014 14:03:28 +0000 (-0400)
Subject: Fix: remove duplicate elements definition in mi_lttng.xsd
X-Git-Tag: v2.6.0-rc1~100
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=278db96d7c6305fceaabf382921ca8578d1b1379;hp=50bba0f31cc69df963f3f652e53b9d6828882410

Fix: remove duplicate elements definition in mi_lttng.xsd

The presence of a *duplicate* elements can lead to ambiguity when
validating when using java validator. This is a mostly rebasing error.
---

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index a54e6bfbf..f63065c39 100644
--- a/src/common/mi_lttng.xsd
+++ b/src/common/mi_lttng.xsd
@@ -437,7 +437,6 @@ THE SOFTWARE.
 	<xs:complexType name="output_type">
 		<xs:choice>
 			<xs:element name="domains" type="domains_type" minOccurs="0" />
-			<xs:element name="session" type="session_type" minOccurs="0" />
 			<xs:element name="sessions" type="sessions_type" minOccurs="0" />
 			<xs:element name="session" type="session_type" minOccurs="0" />
 			<xs:element name="snapshot_action" type="snapshot_action_type" minOccurs="0" />
@@ -450,7 +449,6 @@ THE SOFTWARE.
 			<xs:element name="channels" type="channels_type" minOccurs="0" />
 			<xs:element name="events" type="event_list_type" minOccurs="0" />
 			<xs:element name="channel" type="channel_type" minOccurs="0" />
-			<xs:element name="channels" type="channels_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>