More post-merge fixes

Evolveum · Oct 2, 2017 · d373d07 · d373d07
1 parent 57f051b
commit d373d07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/PagingType.java b/infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/PagingType.java
@@ -37,7 +37,6 @@
  * <p>The following schema fragment specifies the expected content contained within this class.
  *
  * <pre>
-<<<<<<< HEAD
  * &lt;complexType name="PagingType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -46,25 +45,11 @@
  *         &lt;element name="orderDirection" type="{http://prism.evolveum.com/xml/ns/public/query-2}OrderDirectionType" minOccurs="0"/&gt;
  *         &lt;element name="offset" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
  *         &lt;element name="maxSize" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
+ *         &lt;element name="groupBy" type="{http://prism.evolveum.com/xml/ns/public/types-3}XPathType" minOccurs="0"/>
  *       &lt;/sequence&gt;
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
-=======
- * &lt;complexType name="PagingType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="orderBy" type="{http://prism.evolveum.com/xml/ns/public/types-3}XPathType" minOccurs="0"/>
- *         &lt;element name="orderDirection" type="{http://prism.evolveum.com/xml/ns/public/query-2}OrderDirectionType" minOccurs="0"/>
- *         &lt;element name="offset" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         &lt;element name="maxSize" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         &lt;element name="groupBy" type="{http://prism.evolveum.com/xml/ns/public/types-3}XPathType" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
->>>>>>> 0f7b0ca... Adds support for <groupBy> in queries
  * </pre>
  */
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java b/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
@@ -371,7 +371,7 @@ public void test212ParallelModifyElizabethSlow() throws Exception {
 	 * is finished. But the threads are fast and the operations are slow. So this is
 	 * a very slim chance.
 	 */
-	@Test(enabled = false)
+	@Test
 	public void test214ParallelModifyDisableSlow() throws Exception {
 		final String TEST_NAME = "test214ParallelModifyDisableSlow";