You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/09/22 00:16:44 UTC
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-comments
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b88fe7ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b88fe7ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b88fe7ef
Branch: refs/heads/two-dot-o-comments
Commit: b88fe7ef876e9dde93db13f177cfc930f802597f
Parents: cabcb7d 2b60a88
Author: Shawn Feldman <sf...@apache.org>
Authored: Sun Sep 21 16:16:23 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Sun Sep 21 16:16:23 2014 -0600
----------------------------------------------------------------------
.gitignore | 1 +
sdks/java/pom.xml | 8 +-
stack/.gitignore | 4 +-
.../main/dist/init_instance/init_rest_server.sh | 4 +-
.../dist/init_instance/install_elasticsearch.sh | 4 +
stack/config/README.txt | 4 +-
.../main/resources/usergrid-default.properties | 2 +-
.../main/resources/usergrid-core-context.xml | 13 +-
.../persistence/core/astyanax/CassandraFig.java | 4 +-
.../index/impl/EsEntityIndexImpl.java | 76 +++++-----
.../persistence/index/utils/LRUCache2.java | 151 -------------------
stack/launcher/README.txt | 2 +-
.../resources/usergrid-standalone-context.xml | 2 +-
stack/pom.xml | 2 +-
.../apache/usergrid/rest/SystemResource.java | 32 ++--
.../apache/usergrid/rest/NotificationsIT.java | 21 ++-
.../apache/usergrid/rest/TomcatResource.java | 4 +-
stack/rest/src/test/resources/log4j.properties | 11 ++
stack/tools/README.md | 4 +-
19 files changed, 102 insertions(+), 247 deletions(-)
----------------------------------------------------------------------