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 2014/10/20 15:47:02 UTC

[34/50] [abbrv] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o


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

Branch: refs/heads/two-dot-o-events
Commit: f7ab17460e4915a5593f635e0d2939deac3ef868
Parents: e41021d 68bd94f
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 13:39:41 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 13:39:41 2014 -0600

----------------------------------------------------------------------
 stack/core/pom.xml                              |  21 -
 .../corepersistence/CpEntityManager.java        |   2 +-
 .../usergrid/corepersistence/CpWalker.java      |   4 -
 .../PerformanceEntityRebuildIndexTest.java      |  17 +-
 stack/pom.xml                                   |   4 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |   2 +-
 .../usergrid/rest/management/AccessTokenIT.java | 381 ++++++++++---------
 7 files changed, 218 insertions(+), 213 deletions(-)
----------------------------------------------------------------------