usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Date Thu, 21 Aug 2014 04:35:10 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid


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

Branch: refs/heads/master
Commit: b73a3acace06cdccd2857e2475e6ad6e74f2d197
Parents: 6130345 d33cb65
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Aug 20 22:14:21 2014 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Aug 20 22:14:21 2014 -0600

----------------------------------------------------------------------
 NOTICE                                          | 33 ++++++++++++++++++++
 portal/build.sh                                 | 14 +++++++++
 portal/scripts/e2e-test.sh                      | 14 +++++++++
 portal/scripts/test.sh                          | 14 +++++++++
 .../maven-metadata-local.xml                    | 16 ++++++++++
 .../apache/usergrid/android/client/Client.java  | 16 ++++++++++
 .../client/callbacks/ApiResponseCallback.java   | 16 ++++++++++
 .../client/callbacks/ClientAsyncTask.java       | 16 ++++++++++
 .../client/callbacks/ClientCallback.java        | 16 ++++++++++
 .../callbacks/DeviceRegistrationCallback.java   | 16 ++++++++++
 .../callbacks/GroupsRetrievedCallback.java      | 16 ++++++++++
 .../client/callbacks/QueryResultsCallback.java  | 16 ++++++++++
 .../android/client/utils/DeviceUuidFactory.java | 16 ++++++++++
 .../android/client/utils/ObjectUtils.java       | 16 ++++++++++
 .../samples/Books/books/AddBookViewController.h | 14 +++++++++
 sdks/ios/samples/Books/books/AppDelegate.h      | 14 +++++++++
 .../samples/Books/books/BooksViewController.h   | 14 +++++++++
 .../Books/books/UGSignInViewController.h        | 14 +++++++++
 .../ios/samples/Browser/browser/UGAppDelegate.h | 14 +++++++++
 .../Browser/browser/UGAppViewController.h       | 14 +++++++++
 .../browser/UGCollectionViewController.h        | 14 +++++++++
 .../Browser/browser/UGEntityViewController.h    | 14 +++++++++
 .../Browser/browser/UGSignInViewController.h    | 14 +++++++++
 .../Browser/browser/UGTextViewController.h      | 14 +++++++++
 sdks/ios/samples/parties/parties/AppDelegate.h  | 14 ++++++++-
 .../parties/parties/PartiesViewController.h     | 14 ++++++++-
 .../parties/parties/PartyViewController.h       | 14 ++++++++-
 stack/build-tools/pom.xml                       |  2 +-
 stack/cloudbees.xml                             | 18 +++++++++++
 stack/config/pom.xml                            |  2 +-
 .../src/test/resources/usergrid-test.properties | 11 +++++++
 stack/core/pom.xml                              |  2 +-
 stack/launcher/pom.xml                          |  2 +-
 .../maven-metadata-local.xml                    | 16 ++++++++++
 .../recaptcha4j/maven-metadata-local.xml        | 16 ++++++++++
 .../maven-metadata-local.xml                    | 16 ++++++++++
 stack/mongo-emulator/pom.xml                    |  2 +-
 stack/pom.xml                                   |  2 +-
 stack/query-validator/pom.xml                   |  2 +-
 stack/rest/pom.xml                              |  4 +--
 .../rest/src/test/resources/project.properties  | 15 +++++++++
 .../resources/usergrid-custom-test.properties   | 15 +++++++++
 .../resources/usergrid-rest-deploy-context.xml  | 16 ++++++++++
 .../test/resources/usergrid-test-context.xml    | 16 ++++++++++
 stack/services/pom.xml                          |  2 +-
 stack/test-utils/pom.xml                        |  2 +-
 stack/tools/pom.xml                             |  4 +--
 stack/websocket/pom.xml                         |  2 +-
 48 files changed, 567 insertions(+), 17 deletions(-)
----------------------------------------------------------------------



Mime
View raw message