Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4750718B55 for ; Fri, 9 Oct 2015 21:36:44 +0000 (UTC) Received: (qmail 72504 invoked by uid 500); 9 Oct 2015 21:36:44 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 72455 invoked by uid 500); 9 Oct 2015 21:36:44 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 71400 invoked by uid 99); 9 Oct 2015 21:36:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Oct 2015 21:36:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5EC90E10AB; Fri, 9 Oct 2015 21:36:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sfeldman@apache.org To: commits@usergrid.apache.org Date: Fri, 09 Oct 2015 21:37:39 -0000 Message-Id: In-Reply-To: <9d51331c700049ce9e05ec6afb1e1dc0@git.apache.org> References: <9d51331c700049ce9e05ec6afb1e1dc0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [59/63] [abbrv] usergrid git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3b838c82 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3b838c82 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3b838c82 Branch: refs/heads/remove-inmemory-event-service Commit: 3b838c8265abde705ea3b70734aa7de24a8a42d0 Parents: 407ebe0 60acf84 Author: Shawn Feldman Authored: Thu Oct 1 09:41:09 2015 -0600 Committer: Shawn Feldman Committed: Thu Oct 1 09:41:09 2015 -0600 ---------------------------------------------------------------------- README-Docs.md | 13 + README.md | 10 +- content/bootstrap/bootstrap.min.css | 9 + content/community/index.html | 22 +- content/css/bootflat-extensions.css | 356 + content/css/bootflat-square.css | 69 + content/css/bootflat.css | 1560 + content/css/font-awesome.min.css | 405 + content/css/usergrid-site.css | 1553 + .../docs/_sources/jersey2skeleton/README.txt | 9 + .../creating-and-managing-notifications.txt | 2 + .../docs/_sources/rest-endpoints/api-docs.txt | 653 +- content/docs/jersey2skeleton/README.html | 303 + .../creating-and-managing-notifications.html | 1 + content/docs/rest-endpoints/api-docs.html | 533 +- content/docs/searchindex.js | 2 +- content/favicon.ico | Bin 0 -> 3989 bytes 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 content/img/alberto.jpg | Bin 0 -> 16137 bytes content/img/alex.png | Bin 0 -> 40842 bytes 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 content/img/check_flat/default.png | Bin 0 -> 25851 bytes content/img/dave.jpg | Bin 0 -> 14005 bytes content/img/ed.jpg | Bin 0 -> 20460 bytes content/img/egg-logo.png | Bin 0 -> 9938 bytes content/img/github.png | Bin 0 -> 8936 bytes content/img/grey.png | Bin 0 -> 37896 bytes content/img/intellij.png | Bin 0 -> 9199 bytes content/img/jeff.jpg | Bin 0 -> 13857 bytes content/img/michael_r.jpg | Bin 0 -> 10244 bytes content/img/mike_d.JPG | Bin 0 -> 36443 bytes content/img/nate.jpg | Bin 0 -> 4291 bytes content/img/rod.jpg | Bin 0 -> 40313 bytes content/img/scott.jpg | Bin 0 -> 8555 bytes content/img/shawn.jpg | Bin 0 -> 69304 bytes content/img/stliu.jpg | Bin 0 -> 51303 bytes content/img/strong.jpg | Bin 0 -> 7434 bytes content/img/structure101.png | Bin 0 -> 6475 bytes content/img/sungju.jpg | Bin 0 -> 11440 bytes content/img/tim.jpg | Bin 0 -> 7611 bytes content/img/todd.jpg | Bin 0 -> 18142 bytes content/img/usergrid-logo.pdf | 398 + content/img/usergrid.png | Bin 0 -> 21994 bytes content/img/usergrid_160.png | Bin 0 -> 2126 bytes content/img/usergrid_200.png | Bin 0 -> 6397 bytes content/img/usergrid_300.png | Bin 0 -> 16330 bytes content/img/usergrid_300_transparent.png | Bin 0 -> 16308 bytes content/img/usergrid_400.png | Bin 0 -> 8746 bytes content/img/usergrid_800.png | Bin 0 -> 14452 bytes content/img/usergrid_card.png | Bin 0 -> 23295 bytes content/img/usergrid_logo.png | Bin 0 -> 118086 bytes content/img/usergrid_logo_205_50.png | Bin 0 -> 7058 bytes content/img/usergrid_logo_260_50.png | Bin 0 -> 8682 bytes content/img/usergrid_logo_720.png | Bin 0 -> 27610 bytes content/img/usergrid_logo_720p.png | Bin 0 -> 27608 bytes content/img/usergrid_logo_900_200.png | Bin 0 -> 12273 bytes content/img/usergrid_logo_white.png | Bin 0 -> 16900 bytes content/img/usergrid_profile_128.png | Bin 0 -> 6689 bytes content/img/usergrid_profile_256.png | Bin 0 -> 10470 bytes content/img/usergrid_profile_256_white.png | Bin 0 -> 10724 bytes content/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 content/img/usergrid_screencast_bg.png | Bin 0 -> 20478 bytes content/img/usergrid_small_100.png | Bin 0 -> 6681 bytes content/img/usergrid_wiki.png | Bin 0 -> 7135 bytes content/img/yourkit.jpeg | Bin 0 -> 7763 bytes content/js/bootstrap.min.js | 8 + content/js/head.js | 708 + content/js/html5shiv.js | 8 + content/js/jquery-1.10.1.min.js | 6 + content/js/jquery.icheck.js | 397 + content/js/respond.min.js | 6 + content/js/usergrid-site.js | 50 + content/static/github-btn.html | 2 + content/v101-portal-demo/config.js | 129 + content/v101-portal-demo/css/entypo/entypo.eot | Bin 0 -> 35540 bytes content/v101-portal-demo/css/entypo/entypo.svg | 13 + content/v101-portal-demo/css/entypo/entypo.ttf | Bin 0 -> 35392 bytes content/v101-portal-demo/css/entypo/entypo.woff | Bin 0 -> 21916 bytes content/v101-portal-demo/css/main.css | 1990 + content/v101-portal-demo/css/main.min.css | 1 + content/v101-portal-demo/favicon.ico | Bin 0 -> 3989 bytes content/v101-portal-demo/helpJson.json | 47 + .../img/appswitcher/apiPlatform_lg.png | Bin 0 -> 2397 bytes .../img/appswitcher/appServices_lg.png | Bin 0 -> 2295 bytes .../img/appswitcher/console_lg.png | Bin 0 -> 1453 bytes .../img/appswitcher/home_lg.png | Bin 0 -> 1522 bytes .../img/appswitcher/logo_color.png | Bin 0 -> 3459 bytes .../v101-portal-demo/img/appswitcher/max_lg.png | Bin 0 -> 1970 bytes .../img/appswitcher/triangleMenuItem_right.png | Bin 0 -> 1158 bytes .../triangleMenuItem_right_hover.png | Bin 0 -> 1169 bytes content/v101-portal-demo/img/blue-bars.png | Bin 0 -> 3635 bytes content/v101-portal-demo/img/blue-bolt.png | Bin 0 -> 3942 bytes content/v101-portal-demo/img/blue-carat.png | Bin 0 -> 1006 bytes content/v101-portal-demo/img/green_dot.png | Bin 0 -> 3472 bytes .../img/introjs_arrow_step_next.png | Bin 0 -> 219 bytes .../img/introjs_arrow_step_next_disabled.png | Bin 0 -> 220 bytes .../img/introjs_arrow_step_prev.png | Bin 0 -> 217 bytes .../img/introjs_arrow_step_prev_disabled.png | Bin 0 -> 218 bytes content/v101-portal-demo/img/introjs_close.png | Bin 0 -> 274 bytes content/v101-portal-demo/img/logo.png | Bin 0 -> 7758 bytes content/v101-portal-demo/img/nav-device.gif | Bin 0 -> 2184 bytes content/v101-portal-demo/img/nav-sprites.png | Bin 0 -> 7953 bytes content/v101-portal-demo/img/no-data1.png | Bin 0 -> 45300 bytes content/v101-portal-demo/img/phone-small.gif | Bin 0 -> 1300 bytes .../img/push/APNS_cert_upload.png | Bin 0 -> 33956 bytes .../img/push/APNS_certification.png | Bin 0 -> 16855 bytes .../img/push/android-notification.png | Bin 0 -> 41629 bytes .../img/push/google_api_key.png | Bin 0 -> 98118 bytes .../img/push/iphone_message.png | Bin 0 -> 90307 bytes content/v101-portal-demo/img/push/step_1.png | Bin 0 -> 1953 bytes content/v101-portal-demo/img/push/step_2.png | Bin 0 -> 2117 bytes content/v101-portal-demo/img/push/step_3.png | Bin 0 -> 2162 bytes content/v101-portal-demo/img/red_dot.png | Bin 0 -> 3482 bytes .../v101-portal-demo/img/sdk-sprites-large.png | Bin 0 -> 15115 bytes content/v101-portal-demo/img/sdk-sprites.png | Bin 0 -> 4401 bytes content/v101-portal-demo/img/tablet-small.gif | Bin 0 -> 1390 bytes content/v101-portal-demo/img/user-photo.png | Bin 0 -> 3849 bytes content/v101-portal-demo/img/user_profile.png | Bin 0 -> 3775 bytes content/v101-portal-demo/img/verify.png | Bin 0 -> 22934 bytes content/v101-portal-demo/img/yellow_dot.png | Bin 0 -> 3475 bytes content/v101-portal-demo/index-debug.html | 151 + content/v101-portal-demo/index-template.html | 156 + content/v101-portal-demo/index.html | 151 + .../js/generated/usergrid-dev.js | 4886 + .../js/generated/usergrid-libs.min.js | 38 + .../js/generated/usergrid.min.js | 25 + content/v101-portal-demo/js/libs/MD5.min.js | 1 + .../js/libs/angular-1.2.5/angular-animate.js | 1323 + .../libs/angular-1.2.5/angular-animate.min.js | 23 + .../angular-1.2.5/angular-animate.min.js.map | 8 + .../js/libs/angular-1.2.5/angular-cookies.js | 202 + .../libs/angular-1.2.5/angular-cookies.min.js | 8 + .../angular-1.2.5/angular-cookies.min.js.map | 8 + .../js/libs/angular-1.2.5/angular-csp.css | 24 + .../js/libs/angular-1.2.5/angular-loader.js | 410 + .../js/libs/angular-1.2.5/angular-loader.min.js | 9 + .../angular-1.2.5/angular-loader.min.js.map | 8 + .../js/libs/angular-1.2.5/angular-mocks.js | 2116 + .../js/libs/angular-1.2.5/angular-resource.js | 565 + .../libs/angular-1.2.5/angular-resource.min.js | 13 + .../angular-1.2.5/angular-resource.min.js.map | 8 + .../js/libs/angular-1.2.5/angular-route.js | 911 + .../js/libs/angular-1.2.5/angular-route.min.js | 14 + .../libs/angular-1.2.5/angular-route.min.js.map | 8 + .../js/libs/angular-1.2.5/angular-sanitize.js | 622 + .../libs/angular-1.2.5/angular-sanitize.min.js | 14 + .../angular-1.2.5/angular-sanitize.min.js.map | 8 + .../js/libs/angular-1.2.5/angular-scenario.js | 32374 ++++++ .../js/libs/angular-1.2.5/angular-touch.js | 563 + .../js/libs/angular-1.2.5/angular-touch.min.js | 13 + .../libs/angular-1.2.5/angular-touch.min.js.map | 8 + .../js/libs/angular-1.2.5/angular.js | 20369 ++++ .../js/libs/angular-1.2.5/angular.min.js | 201 + .../js/libs/angular-1.2.5/angular.min.js.map | 8 + .../js/libs/angular-1.2.5/errors.json | 1 + .../js/libs/angular-1.2.5/version.json | 1 + .../js/libs/angular-1.2.5/version.txt | 1 + .../libs/bootstrap/css/bootstrap-responsive.css | 1345 + .../bootstrap/css/bootstrap-responsive.min.css | 1245 + .../js/libs/bootstrap/css/bootstrap.css | 6169 ++ .../js/libs/bootstrap/css/bootstrap.min.css | 5469 ++ .../js/libs/bootstrap/custom/css/bootstrap.css | 6316 ++ .../libs/bootstrap/custom/css/bootstrap.min.css | 9 + .../custom/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../custom/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes .../js/libs/bootstrap/custom/js/bootstrap.js | 2291 + .../libs/bootstrap/custom/js/bootstrap.min.js | 7 + .../img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes .../js/libs/bootstrap/js/bootstrap.js | 2117 + .../js/libs/bootstrap/js/bootstrap.min.js | 644 + .../v101-portal-demo/js/libs/google-viz-api.js | 49 + .../js/libs/jquery/jquery-1.9.1.min.js | 5 + .../js/libs/jquery/jquery-migrate-1.1.1.min.js | 3 + .../js/libs/jquery/jquery.sparkline.min.js | 5 + .../js/libs/jqueryui/date.min.js | 2 + .../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin 0 -> 251 bytes .../images/ui-bg_flat_100_deedf7_40x100.png | Bin 0 -> 182 bytes .../images/ui-bg_flat_100_e4f1fb_40x100.png | Bin 0 -> 213 bytes .../images/ui-bg_flat_100_f2f5f7_40x100.png | Bin 0 -> 212 bytes .../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin 0 -> 181 bytes .../images/ui-bg_flat_50_3baae3_40x100.png | Bin 0 -> 182 bytes .../images/ui-bg_flat_80_d7ebf9_40x100.png | Bin 0 -> 183 bytes .../ui-bg_highlight-hard_70_000000_1x100.png | Bin 0 -> 118 bytes .../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin 0 -> 153 bytes .../jqueryui/images/ui-icons_000000_256x240.png | Bin 0 -> 4369 bytes .../jqueryui/images/ui-icons_2694e8_256x240.png | Bin 0 -> 4369 bytes .../jqueryui/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../jqueryui/images/ui-icons_3d80b3_256x240.png | Bin 0 -> 4369 bytes .../jqueryui/images/ui-icons_72a7cf_256x240.png | Bin 0 -> 4369 bytes .../jqueryui/images/ui-icons_ffffff_256x240.png | Bin 0 -> 4369 bytes .../js/libs/jqueryui/jquery-ui-1.8.18.min.js | 15 + .../js/libs/jqueryui/jquery-ui-1.8.9.custom.css | 1 + .../js/libs/jqueryui/jquery-ui-timepicker.css | 1 + .../libs/jqueryui/jquery.ui.timepicker.min.js | 1 + .../ui-bootstrap-custom-0.3.0.min.js | 1 + .../ui-bootstrap-custom-tpls-0.3.0.min.js | 1 + .../v101-portal-demo/js/libs/usergrid.sdk.js | 2568 + docs/rest-endpoints/api-docs.html | 750 +- docs/rest-endpoints/api-docs.md | 142 +- 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/mike_d.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/crash.log | 143 + 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 | 4 +- website/tmp/compiled_content | 87099 +---------------- website/tmp/dependencies | Bin 2372 -> 2397 bytes website/tmp/rule_memory | Bin 0 -> 5163 bytes website/utilities/map-markers.rb | 62 + website/utilities/markers.txt | 440 + website/utilities/snapshot-apigee.rb | 71 + website/utilities/usergrid.csv | 290 + 299 files changed, 111298 insertions(+), 87017 deletions(-) ----------------------------------------------------------------------