[USERGRID-342] Added unimplemented remove method to ElasticSearchQuer…

…yExecutor. Fixed merge artifact in AdminEmailEncodingIT
buondoi · Mar 27, 2015 · d20267b · d20267b
1 parent 2d1c8b8
commit d20267b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java b/...src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java
@@ -208,4 +208,9 @@ public Results next() {
 
         return toReturn;
     }
+
+    @Override
+    public void remove() {
+        throw new RuntimeException("Remove not implemented!!");
+    }
 }
diff --git a/...src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java b/...src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
@@ -88,13 +88,9 @@ public void getTokenQuote() throws Exception {
      * Given an organization name and an arbitrary character or string,
      * ensure that an organization and admin user can be created when
      * the given string is a part of the admin email address
-<<<<<<< HEAD
-     * @param symbol
-=======
      *
      * @param symbol
-     * @throws IOException
->>>>>>> b4727f1db4b3e3e312b6f40d25a42ee66246cfd7
+     * @throws UniformInterfaceException
      */
     private void doTest(String symbol) throws UniformInterfaceException {