Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid into release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/80f1dd22 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/80f1dd22 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/80f1dd22 Branch: refs/heads/release Commit: 80f1dd22f1944c1ecdf4d51ca2182186daa8dbc4 Parents: f7dfff4 75a73b4 Author: Michael Russo <michaelaru...@gmail.com> Authored: Mon Feb 8 09:45:04 2016 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Mon Feb 8 09:45:04 2016 -0800 ---------------------------------------------------------------------- .usergridversion | 2 +- CHANGELOG | 13 + README.md | 4 +- docs/data-queries/operators-and-types.md | 25 +- docs/installation/deployment-guide.md | 474 + docs/installation/ug2-deploy-to-tomcat.md | 44 +- docs/jersey2skeleton/README.md | 9 + docs/jersey2skeleton/pom.xml | 387 + .../usergrid/testapp/AbstractResource.java | 51 + .../apache/usergrid/testapp/ApiResponse.java | 52 + .../org/apache/usergrid/testapp/Entity.java | 55 + .../usergrid/testapp/ManagementResource.java | 56 + .../usergrid/testapp/OrganizationResource.java | 64 + .../usergrid/testapp/OrganizationsResource.java | 76 + .../apache/usergrid/testapp/StatusResource.java | 34 + .../java/org/apache/usergrid/testapp/User.java | 28 + .../src/main/resources/applicationContext.xml | 28 + .../main/resources/jersey2skeleton-context.xml | 28 + .../src/main/webapp/WEB-INF/web.xml | 95 + .../usergrid/testapp/AvailablePortFinder.java | 208 + .../usergrid/testapp/OrganizationTest.java | 127 + .../org/apache/usergrid/testapp/TomcatMain.java | 57 + .../apache/usergrid/testapp/TomcatRuntime.java | 185 + .../src/test/resources/log4j.properties | 31 + .../src/test/resources/logging.properties | 26 + docs/jersey2skeleton/templates/markdown.hbs | 108 + docs/jersey2skeleton/templates/operation.hbs | 73 + docs/jersey2skeleton/templates/security.hbs | 88 + .../templates/strapdown.html.hbs | 10 + docs/push.tgz | Bin 1651449 -> 0 bytes docs/rest-endpoints/api-docs.html | 750 +- docs/rest-endpoints/api-docs.md | 142 +- release/README.txt | 6 +- release/binary-release.sh | 45 + release/pom.xml | 95 + release/release-candidate.sh | 102 +- release/release.sh | 79 +- release/src/main/assembly/binary.xml | 98 + sdks/html5-javascript/Release.md | 6 - website/README.md | 3 +- website/Rules | 52 + website/build.sh | 1 + website/content/bootstrap/bootstrap.min.css | 9 + website/content/community/index.html | 22 +- website/content/css/bootflat-extensions.css | 356 + website/content/css/bootflat-square.css | 69 + website/content/css/bootflat.css | 1560 + website/content/css/font-awesome.min.css | 405 + website/content/css/usergrid-site.css | 1553 + website/content/favicon.ico | Bin 0 -> 3989 bytes website/content/font/FontAwesome.otf | Bin 0 -> 61896 bytes .../content/font/fontawesome-webfont-eot.eot | Bin 0 -> 37405 bytes .../content/font/fontawesome-webfont-svg.svg | 399 + .../content/font/fontawesome-webfont-ttf.ttf | Bin 0 -> 79076 bytes .../content/font/fontawesome-webfont-woff.woff | Bin 0 -> 43572 bytes website/content/img/alberto.jpg | Bin 0 -> 16137 bytes website/content/img/alex.png | Bin 0 -> 40842 bytes website/content/img/apache_usergrid_favicon.png | Bin 0 -> 10735 bytes .../content/img/apache_usergrid_logo_white.png | Bin 0 -> 26418 bytes .../img/apache_usergrid_logo_white_small.png | Bin 0 -> 11905 bytes website/content/img/check_flat/default.png | Bin 0 -> 25851 bytes website/content/img/dave.jpg | Bin 0 -> 14005 bytes website/content/img/ed.jpg | Bin 0 -> 20460 bytes website/content/img/egg-logo.png | Bin 0 -> 9938 bytes website/content/img/github.png | Bin 0 -> 8936 bytes website/content/img/grey.png | Bin 0 -> 37896 bytes website/content/img/intellij.png | Bin 0 -> 9199 bytes website/content/img/jeff.jpg | Bin 0 -> 13857 bytes website/content/img/michael_r.jpg | Bin 0 -> 10244 bytes website/content/img/miked.jpg | Bin 0 -> 36443 bytes website/content/img/nate.jpg | Bin 0 -> 4291 bytes website/content/img/rod.jpg | Bin 0 -> 40313 bytes website/content/img/scott.jpg | Bin 0 -> 8555 bytes website/content/img/shawn.jpg | Bin 0 -> 69304 bytes website/content/img/stliu.jpg | Bin 0 -> 51303 bytes website/content/img/strong.jpg | Bin 0 -> 7434 bytes website/content/img/structure101.png | Bin 0 -> 6475 bytes website/content/img/sungju.jpg | Bin 0 -> 11440 bytes website/content/img/tim.jpg | Bin 0 -> 7611 bytes website/content/img/todd.jpg | Bin 0 -> 18142 bytes website/content/img/usergrid-logo.pdf | 398 + website/content/img/usergrid.png | Bin 0 -> 21994 bytes website/content/img/usergrid_160.png | Bin 0 -> 2126 bytes website/content/img/usergrid_200.png | Bin 0 -> 6397 bytes website/content/img/usergrid_300.png | Bin 0 -> 16330 bytes .../content/img/usergrid_300_transparent.png | Bin 0 -> 16308 bytes website/content/img/usergrid_400.png | Bin 0 -> 8746 bytes website/content/img/usergrid_800.png | Bin 0 -> 14452 bytes website/content/img/usergrid_card.png | Bin 0 -> 23295 bytes website/content/img/usergrid_logo.png | Bin 0 -> 118086 bytes website/content/img/usergrid_logo_205_50.png | Bin 0 -> 7058 bytes website/content/img/usergrid_logo_260_50.png | Bin 0 -> 8682 bytes website/content/img/usergrid_logo_720.png | Bin 0 -> 27610 bytes website/content/img/usergrid_logo_720p.png | Bin 0 -> 27608 bytes website/content/img/usergrid_logo_900_200.png | Bin 0 -> 12273 bytes website/content/img/usergrid_logo_white.png | Bin 0 -> 16900 bytes website/content/img/usergrid_profile_128.png | Bin 0 -> 6689 bytes website/content/img/usergrid_profile_256.png | Bin 0 -> 10470 bytes .../content/img/usergrid_profile_256_white.png | Bin 0 -> 10724 bytes .../img/usergrid_profile_512_margins.png | Bin 0 -> 19112 bytes .../content/img/usergrid_profile_64_white.png | Bin 0 -> 4839 bytes .../content/img/usergrid_profile_background.png | Bin 0 -> 6710 bytes website/content/img/usergrid_screencast_bg.png | Bin 0 -> 20478 bytes website/content/img/usergrid_small_100.png | Bin 0 -> 6681 bytes website/content/img/usergrid_wiki.png | Bin 0 -> 7135 bytes website/content/img/yourkit.jpeg | Bin 0 -> 7763 bytes website/content/js/bootstrap.min.js | 8 + website/content/js/head.js | 708 + website/content/js/html5shiv.js | 8 + website/content/js/jquery-1.10.1.min.js | 6 + website/content/js/jquery.icheck.js | 397 + website/content/js/respond.min.js | 6 + website/content/js/usergrid-site.js | 50 + website/content/static/github-btn.html | 2 + website/layouts/community.html | 1 + website/layouts/docs.html | 1 + website/lib/default.rb | 43 + website/lib/helpers_.rb | 0 website/lib/pandoc.template | 4 + website/nanoc.yaml | 77 + website/run.sh | 1 + website/tmp/checksums | 2 - website/tmp/compiled_content | 91665 ----------------- website/tmp/dependencies | Bin 2372 -> 0 bytes website/utilities/map-markers.rb | 62 + website/utilities/markers.txt | 440 + website/utilities/snapshot-apigee.rb | 71 + website/utilities/usergrid.csv | 290 + 128 files changed, 10244 insertions(+), 92186 deletions(-) ----------------------------------------------------------------------