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/06/29 19:40:52 UTC
[40/50] [abbrv] incubator-usergrid git commit: Merge branch 'pr/285'
into two-dot-o-dev
Merge branch 'pr/285' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b0d68692
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b0d68692
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b0d68692
Branch: refs/heads/USERGRID-703
Commit: b0d68692ef38169d608824d37180f4942c027e96
Parents: d23ed04 9f5b8dd
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 24 09:50:12 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 24 09:50:12 2015 -0600
----------------------------------------------------------------------
.../main/resources/usergrid-default.properties | 767 ++++++++++++++-----
.../asyncevents/AsyncIndexProvider.java | 2 +-
.../index/IndexProcessorFig.java | 46 +-
.../persistence/core/metrics/MetricsFig.java | 5 +-
.../usergrid/persistence/index/IndexFig.java | 96 +--
.../usergrid/persistence/queue/QueueFig.java | 32 +-
6 files changed, 661 insertions(+), 287 deletions(-)
----------------------------------------------------------------------