You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/02/26 17:27:34 UTC

[10/50] [abbrv] incubator-usergrid git commit: Oops. Compile error fixes.

Oops. Compile error fixes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a607a166
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a607a166
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a607a166

Branch: refs/heads/two-dot-o
Commit: a607a166935f090349e8ed4a00a03f3773e6e087
Parents: f004f5a
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Feb 23 10:44:18 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Feb 23 10:44:18 2015 -0500

----------------------------------------------------------------------
 .../apache/usergrid/corepersistence/CpEntityManagerFactory.java | 1 -
 .../persistence/cassandra/EntityManagerFactoryImpl.java         | 5 -----
 2 files changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a607a166/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 59f2c9e..ebb3136 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -459,7 +459,6 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
     }
 
 
-    @Override
     @Metered(group = "core", name = "EntityManagerFactory_getApplication")
     public Map<String, UUID> getApplications(boolean deleted) throws Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a607a166/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index 05cbf5e..8b5906c 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -485,9 +485,4 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
         throw new UnsupportedOperationException("Not supported in v1");
     }
 
-    @Override
-    public Map<String, UUID> getApplications(boolean deleted) throws Exception {
-        throw new UnsupportedOperationException("Not supported in v1");
-    }
-
 }