You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/03/03 21:01:03 UTC
[24/37] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-273-indexbuffer
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/649a50ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/649a50ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/649a50ec
Branch: refs/heads/USERGRID-422
Commit: 649a50ece5faa9ef63e01d2e06c3a4ae8efbee06
Parents: 8eb09e0 ec6d4e8
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Feb 25 11:49:19 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Feb 25 11:49:19 2015 -0700
----------------------------------------------------------------------
stack/pom.xml | 1 +
stack/rest/pom.xml | 42 ++---
.../resources/usergrid-rest-deploy-context.xml | 2 +-
.../apache/usergrid/rest/AbstractRestIT.java | 116 ++++++++-----
.../org/apache/usergrid/rest/SimplestTest.java | 35 ++++
.../org/apache/usergrid/rest/TomcatRuntime.java | 4 +-
.../applications/ApplicationResourceIT.java | 174 ++++++++-----------
.../resources/usergrid-rest-deploy-context.xml | 26 +++
8 files changed, 218 insertions(+), 182 deletions(-)
----------------------------------------------------------------------