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/08/20 17:58:51 UTC

[2/2] git commit: Merge branch 'pr/45'

Merge branch 'pr/45'


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

Branch: refs/heads/master
Commit: 717e4fe9bdf7fd85f1f0efa6399ac41c3086379b
Parents: 7fab673 18204c5
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 15 10:46:08 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Aug 15 10:46:08 2014 -0400

----------------------------------------------------------------------
 .../usergrid-java-client/maven-metadata-local.xml | 16 ++++++++++++++++
 stack/cloudbees.xml                               | 18 ++++++++++++++++++
 .../AppleJavaExtensions/maven-metadata-local.xml  | 16 ++++++++++++++++
 .../recaptcha4j/maven-metadata-local.xml          | 16 ++++++++++++++++
 .../usergrid-java-client/maven-metadata-local.xml | 16 ++++++++++++++++
 stack/rest/src/test/resources/project.properties  | 15 +++++++++++++++
 .../resources/usergrid-custom-test.properties     | 15 +++++++++++++++
 .../resources/usergrid-rest-deploy-context.xml    | 16 ++++++++++++++++
 .../src/test/resources/usergrid-test-context.xml  | 16 ++++++++++++++++
 9 files changed, 144 insertions(+)
----------------------------------------------------------------------