Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid into asf-site
* 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid: # Conflicts: # website/tmp/checksums # website/tmp/compiled_content # website/tmp/dependencies # website/tmp/rule_memory Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2d4d8aaa Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2d4d8aaa Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2d4d8aaa Branch: refs/heads/usergrid-1318-queue Commit: 2d4d8aaad8f0cf9a8575a886c809e4d0263d070c Parents: f0a2f8c 85ca4b8 Author: Dave Johnson <[email protected]> Authored: Mon Aug 22 10:59:13 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon Aug 22 10:59:13 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
