usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [44/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o' into USERGRID-405
Date Thu, 19 Mar 2015 23:27:01 GMT
Merge branch 'two-dot-o' into USERGRID-405

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java


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

Branch: refs/heads/USERGRID-480
Commit: b35551a07ed539ff8277892c00b7d530722cf784
Parents: 5e6ed4a 61c5f9c
Author: Todd Nine <tnine@apigee.com>
Authored: Thu Mar 19 10:23:12 2015 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Thu Mar 19 10:23:12 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/CpRelationManager.java      |  7 +-
 .../results/FilteringLoader.java                | 50 +++++++-----
 .../corepersistence/StaleIndexCleanupTest.java  | 48 +++++++++++
 .../index/impl/EsEntityIndexImpl.java           | 83 +++++++++-----------
 .../applications/ApplicationsResource.java      |  6 --
 5 files changed, 121 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b35551a0/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 8804d2b,1838eec..e66bd8d
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@@ -56,9 -56,8 +56,11 @@@ import org.elasticsearch.action.admin.c
  import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
  import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksRequest;
  import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksResponse;
 +import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
 +import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
 +import org.elasticsearch.action.admin.indices.alias.get.GetAliasesResponse;
+ import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
+ import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
  import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
  import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
  import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;


Mime
View raw message