Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into entity-size
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c08ad512 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c08ad512 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c08ad512 Branch: refs/heads/two-dot-o-dev Commit: c08ad512568f68d32b37bfd110729318db8778e6 Parents: 198f489 ac9da14 Author: Shawn Feldman <[email protected]> Authored: Wed Aug 26 09:39:55 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Wed Aug 26 09:39:55 2015 -0600 ---------------------------------------------------------------------- DISCLAIMER | 9 - NOTICE | 2 +- README.md | 9 +- content/community/index.html | 48 +- content/docs/README.html | 35 +- content/docs/_images/asapp.png | Bin 0 -> 73593 bytes content/docs/_images/asemu.png | Bin 0 -> 34744 bytes content/docs/_images/assettings.png | Bin 0 -> 120338 bytes content/docs/_images/gcmsetting.png | Bin 0 -> 101084 bytes content/docs/_images/googleproj0.png | Bin 0 -> 62311 bytes content/docs/_images/ios-cert.png | Bin 0 -> 41925 bytes content/docs/_images/iospgapp.png | Bin 0 -> 29796 bytes content/docs/_images/iospgcert.png | Bin 0 -> 41925 bytes content/docs/_images/iospgsettings.png | Bin 0 -> 384425 bytes content/docs/_images/iospushauth.png | Bin 0 -> 42175 bytes content/docs/_images/iospushfinal.png | Bin 0 -> 29573 bytes content/docs/_images/iospushsettings.png | Bin 0 -> 137812 bytes content/docs/_images/iphonemessage.png | Bin 0 -> 80970 bytes content/docs/_images/pgaapp.png | Bin 0 -> 74807 bytes content/docs/_images/pgasettings.png | Bin 0 -> 95052 bytes content/docs/_images/pgaspath.png | Bin 0 -> 34744 bytes content/docs/_images/pushmiddleandroid0.png | Bin 0 -> 106080 bytes content/docs/_images/pushmiddleios0.png | Bin 0 -> 105175 bytes content/docs/_images/pushsslcertificate.png | Bin 0 -> 53445 bytes content/docs/_images/sendnotification.png | Bin 0 -> 47353 bytes content/docs/_sources/README.txt | 11 +- .../file-storage-configuration.txt | 39 + .../docs/_sources/assets-and-files/folders.txt | 85 + .../assets-and-files/legacy-asset-support.txt | 0 .../assets-and-files/retrieving-assets.txt | 27 + .../assets-and-files/uploading-assets.txt | 86 + .../data-queries/operators-and-types.txt | 2 +- .../_sources/data-queries/query-parameters.txt | 2 +- .../data-queries/querying-your-data.txt | 2 +- .../docs/_sources/data-storage/collections.txt | 8 +- .../_sources/data-storage/data-store-dbms.txt | 12 +- content/docs/_sources/data-storage/entities.txt | 10 +- .../entity-connections/retrieving-entities.txt | 9 +- .../docs/_sources/geolocation/geolocation.txt | 2 +- .../creating-a-new-application.txt | 6 +- .../getting-started/creating-account.txt | 6 +- .../getting-started/using-a-sandbox-app.txt | 2 +- .../_sources/getting-started/using-the-api.txt | 2 +- content/docs/_sources/index.txt | 30 +- .../installation/ug1-deploy-to-tomcat.txt | 6 +- .../installation/ug1-launcher-quick-start.txt | 2 +- .../installation/ug2-deploy-to-tomcat.txt | 4 +- .../docs/_sources/introduction/data-model.txt | 30 +- content/docs/_sources/introduction/overview.txt | 17 + .../_sources/introduction/usergrid-features.txt | 28 +- .../docs/_sources/orgs-and-apps/admin-user.txt | 2 +- .../docs/_sources/orgs-and-apps/application.txt | 2 +- .../push-notifications/adding-push-support.txt | 158 + .../creating-and-managing-notifications.txt | 269 ++ .../push-notifications/creating-notifiers.txt | 69 + .../push-notifications/getting-started.txt | 102 + .../managing-users-and-devices.txt | 313 ++ .../_sources/push-notifications/overview.txt | 58 + .../_sources/push-notifications/registering.txt | 102 + .../push-notifications/troubleshooting.txt | 93 + .../_sources/push-notifications/tutorial.txt | 251 + .../docs/_sources/reference/contribute-code.txt | 2 +- .../docs/_sources/rest-endpoints/api-docs.txt | 4385 +++++++++-------- content/docs/_sources/sdks/ios-new.txt | 982 ++++ content/docs/_sources/sdks/sdk-outline.txt | 111 + content/docs/_sources/sdks/usage.txt | 16 - .../authenticating-api-requests.txt | 6 +- ...enticating-users-and-application-clients.txt | 6 +- .../security-and-auth/facebook-sign.txt | 2 +- .../user-authentication-types.txt | 6 +- .../security-and-auth/using-permissions.txt | 4 +- .../_sources/security-and-auth/using-roles.txt | 304 ++ .../docs/_sources/user-management/activity.txt | 17 +- content/docs/_sources/user-management/group.txt | 12 +- .../user-management/messagee-example.txt | 8 +- .../user-management/working-user-data.txt | 12 +- content/docs/_static/css/theme.css | 168 +- .../file-storage-configuration.html | 335 ++ content/docs/assets-and-files/folders.html | 404 ++ .../assets-and-files/legacy-asset-support.html | 293 ++ .../assets-and-files/retrieving-assets.html | 372 ++ .../docs/assets-and-files/uploading-assets.html | 432 ++ .../creating-and-incrementing-counters.html | 24 +- .../events-and-counters.html | 28 +- .../retrieving-counters.html | 24 +- .../docs/data-queries/advanced-query-usage.html | 24 +- .../docs/data-queries/operators-and-types.html | 28 +- content/docs/data-queries/query-parameters.html | 27 +- .../docs/data-queries/querying-your-data.html | 28 +- content/docs/data-storage/collections.html | 48 +- content/docs/data-storage/data-store-dbms.html | 44 +- content/docs/data-storage/entities.html | 51 +- .../docs/data-storage/optimizing-access.html | 24 +- .../entity-connections/connecting-entities.html | 24 +- .../disconnecting-entities.html | 28 +- .../entity-connections/retrieving-entities.html | 38 +- content/docs/genindex.html | 24 +- content/docs/geolocation/geolocation.html | 30 +- .../creating-a-new-application.html | 42 +- .../docs/getting-started/creating-account.html | 41 +- .../getting-started/using-a-sandbox-app.html | 39 +- content/docs/getting-started/using-the-api.html | 27 +- content/docs/index.html | 202 +- .../docs/installation/ug1-deploy-to-tomcat.html | 35 +- .../installation/ug1-launcher-quick-start.html | 30 +- .../docs/installation/ug2-deploy-to-tomcat.html | 29 +- content/docs/introduction/async-vs-sync.html | 28 +- content/docs/introduction/data-model.html | 54 +- content/docs/introduction/overview.html | 333 ++ .../docs/introduction/usergrid-features.html | 91 +- content/docs/objects.inv | Bin 663 -> 692 bytes content/docs/orgs-and-apps/admin-user.html | 104 +- content/docs/orgs-and-apps/application.html | 39 +- content/docs/orgs-and-apps/managing.html | 24 +- content/docs/orgs-and-apps/organization.html | 24 +- .../push-notifications/adding-push-support.html | 581 +++ .../creating-and-managing-notifications.html | 742 +++ .../push-notifications/creating-notifiers.html | 425 ++ .../push-notifications/getting-started.html | 497 ++ .../managing-users-and-devices.html | 688 +++ content/docs/push-notifications/overview.html | 393 ++ .../docs/push-notifications/registering.html | 484 ++ content/docs/push-notifications/tbd.html | 24 +- .../push-notifications/troubleshooting.html | 466 ++ content/docs/push-notifications/tutorial.html | 666 +++ .../docs/push-notifications/users-devices.html | 24 +- content/docs/reference/contribute-code.html | 28 +- content/docs/reference/presos-and-videos.html | 24 +- content/docs/rest-endpoints/api-docs.html | 4417 +++++++++--------- content/docs/sdks/ios-new.html | 1323 ++++++ content/docs/sdks/sdk-outline.html | 516 ++ content/docs/sdks/tbd.html | 24 +- content/docs/sdks/usage.html | 308 -- content/docs/search.html | 24 +- content/docs/searchindex.js | 2 +- .../docs/security-and-auth/app-security.html | 28 +- .../authenticating-api-requests.html | 36 +- ...nticating-users-and-application-clients.html | 46 +- .../changing-token-time-live-ttl.html | 24 +- .../docs/security-and-auth/facebook-sign.html | 26 +- .../revoking-tokens-logout.html | 24 +- .../security-and-auth/securing-your-app.html | 24 +- .../user-authentication-types.html | 45 +- .../security-and-auth/using-permissions.html | 36 +- content/docs/security-and-auth/using-roles.html | 753 +++ content/docs/user-management/activity.html | 63 +- content/docs/user-management/group.html | 51 +- content/docs/user-management/groups.html | 24 +- .../docs/user-management/messagee-example.html | 34 +- .../docs/user-management/user-connections.html | 24 +- .../docs/user-management/user-management.html | 24 +- .../docs/user-management/working-user-data.html | 59 +- content/index.html | 48 +- content/releases/index.html | 44 +- docs/installation/ug1-deploy-to-tomcat.md | 6 +- docs/installation/ug1-launcher-quick-start.md | 2 +- docs/installation/ug2-deploy-to-tomcat.md | 4 +- docs/reference/contribute-code.md | 2 +- docs/rest-endpoints/api-docs.html | 1254 ++--- docs/rest-endpoints/api-docs.md | 3434 ++++++++------ .../main/groovy/usergrid/ApiDocGenerator.groovy | 23 +- docs/src/main/resources/html/model.mustache | 6 +- docs/src/main/resources/markdown/model.mustache | 41 +- .../main/resources/markdown/operation.mustache | 2 + docs/user-management/messagee-example.md | 6 +- portal/README.md | 4 +- portal/index-template.html | 14 +- release/release-candidate.sh | 12 +- release/release.sh | 16 +- sdks/android/NOTICE | 2 +- sdks/android/pom.xml | 2 +- sdks/dotnet/NOTICE | 2 +- sdks/dotnet/README.md | 4 +- sdks/html5-javascript/README.md | 10 +- sdks/html5-javascript/index.html | 2 +- sdks/java/pom.xml | 6 +- sdks/perl/README.md | 2 +- sdks/perl/lib/Usergrid/Client.pm | 2 +- sdks/php/README.md | 6 +- sdks/ruby-on-rails/README.md | 2 +- stack/README.md | 4 +- .../corepersistence/CpEntityMapUtilsTest.java | 79 + .../model/entity/MapToEntityConverter.java | 10 +- .../java/org/apache/usergrid/launcher/App.java | 2 +- website/README.md | 2 +- website/content/community/index.html | 12 +- website/content/index.html | 97 + website/content/releases/index.html | 65 + website/layouts/footer.html | 32 +- website/layouts/header.html | 4 +- website/tmp/checksums | 4 +- website/tmp/compiled_content | 204 +- 192 files changed, 22559 insertions(+), 7354 deletions(-) ----------------------------------------------------------------------
