[37/37] usergrid git commit: Merge branch 'master' into usergrid-1318-queue

Merge branch 'master' into usergrid-1318-queue Conflicts: content/releases/index.html stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java website/content/releases/index.html Project:

[33/37] usergrid git commit: Update Cassandra and ElasticSearch versions supported & add node about the need for start_rpc=true in Cassandra 2+

Update Cassandra and ElasticSearch versions supported & add node about the need for start_rpc=true in Cassandra 2+ Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/77ad91a6 Tree:

[32/37] usergrid git commit: Update Cassandra and ElasticSearch versions supported & add node about the need for start_rpc=true in Cassandra 2+

http://git-wip-us.apache.org/repos/asf/usergrid/blob/77ad91a6/content/docs/searchindex.js -- diff --git a/content/docs/searchindex.js b/content/docs/searchindex.js index 4b26d9e..9016020 100644 --- a/content/docs/searchindex.js

[26/37] 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 * 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Ensure the admin invited to org email is sent even when external SSO is enabled. Configurable Password Policy and 5 supporting JUnit tests. Project:

[21/37] usergrid git commit: Configurable Password Policy and 5 supporting JUnit tests.

Configurable Password Policy and 5 supporting JUnit tests. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a30e1a56 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a30e1a56 Diff:

[02/37] usergrid git commit: fix miked link

http://git-wip-us.apache.org/repos/asf/usergrid/blob/2298062e/website/tmp/compiled_content -- diff --git a/website/tmp/compiled_content b/website/tmp/compiled_content index 3ac8a96..f32524c 100644 ---

[03/37] usergrid git commit: fix miked link

fix miked link Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2298062e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2298062e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2298062e Branch:

[17/37] usergrid git commit: Add a utility queue to the async event service for things like re-index.

Add a utility queue to the async event service for things like re-index. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f8c92f6e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f8c92f6e Diff:

[24/37] usergrid git commit: Ensure the admin invited to org email is sent even when external SSO is enabled.

Ensure the admin invited to org email is sent even when external SSO is enabled. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/48d306f4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/48d306f4 Diff:

[31/37] usergrid git commit: Update Cassandra and ElasticSearch versions supported & add node about the need for start_rpc=true in Cassandra 2+

http://git-wip-us.apache.org/repos/asf/usergrid/blob/77ad91a6/docs/installation/deployment-guide.md -- diff --git a/docs/installation/deployment-guide.md b/docs/installation/deployment-guide.md index 560b6eb..3b1b89a 100644 ---

[28/37] usergrid git commit: Correcting links to keys for USERGRID-1281

http://git-wip-us.apache.org/repos/asf/usergrid/blob/11ad1d76/website/tmp/dependencies -- diff --git a/website/tmp/dependencies b/website/tmp/dependencies index d23a3b7..8ddff40 100644 --- a/website/tmp/dependencies +++

[06/37] usergrid git commit: Merge branch 'master' into asf-site

Merge branch 'master' into asf-site Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cbe501af Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cbe501af Diff:

[36/37] usergrid git commit: Fix typo and unused reference

Fix typo and unused reference Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fe3bf560 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fe3bf560 Diff:

[01/37] usergrid git commit: fix miked link

Repository: usergrid Updated Branches: refs/heads/usergrid-1318-queue f56e1b0d1 -> 7cc5c1c07 http://git-wip-us.apache.org/repos/asf/usergrid/blob/2298062e/website/tmp/dependencies -- diff --git a/website/tmp/dependencies

[30/37] usergrid git commit: Correcting links to keys for USERGRID-1281

Correcting links to keys for USERGRID-1281 Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/11ad1d76 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/11ad1d76 Diff:

[22/37] usergrid git commit: Tools to remove an Admin User from an Organization using the management service and the graph manager to remove any lingering edges.

Tools to remove an Admin User from an Organization using the management service and the graph manager to remove any lingering edges. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9c5f5993 Tree:

[05/37] usergrid git commit: Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid into asf-site

Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid into asf-site Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0fd9939b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0fd9939b

[15/37] usergrid git commit: Add ability to start initial re-index seek with the UNIX timestamp. This will only start seeking from the time provided, rather than seeking all and discarding what doesn'

Add ability to start initial re-index seek with the UNIX timestamp. This will only start seeking from the time provided, rather than seeking all and discarding what doesn't match a filter. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit:

[04/37] usergrid git commit: Another try at rename.

Another try at rename. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f3879a46 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f3879a46 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f3879a46

[08/37] usergrid git commit: Merge branch 'master' into asf-site

Merge branch 'master' into asf-site Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/619aff37 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/619aff37 Diff:

[18/37] usergrid git commit: Make sure that 2nd hop index event lands on utility queue if it was consumed from that queue originally.

Make sure that 2nd hop index event lands on utility queue if it was consumed from that queue originally. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a4cc63f8 Tree:

[29/37] usergrid git commit: Correcting links to keys for USERGRID-1281

http://git-wip-us.apache.org/repos/asf/usergrid/blob/11ad1d76/website/tmp/compiled_content -- diff --git a/website/tmp/compiled_content b/website/tmp/compiled_content index f32524c..91c5445 100644 ---

[34/37] usergrid git commit: If claims cannot be parsed, fetch new JWT token

If claims cannot be parsed, fetch new JWT token Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d7c14bbc Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d7c14bbc Diff:

[14/37] usergrid git commit: Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid into asf-site

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 #

[10/37] usergrid git commit: Merge branch 'master' into asf-site

Merge branch 'master' into asf-site Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/967f7c8c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/967f7c8c Diff:

[25/37] usergrid git commit: Add missing bad_confirmation_token.jsp

Add missing bad_confirmation_token.jsp Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1abafe72 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1abafe72 Diff:

[11/37] usergrid git commit: Merge branch 'master' into asf-site

Merge branch 'master' into asf-site Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ddcc14f4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ddcc14f4 Diff:

[27/37] usergrid git commit: Merge branch 'asf-site'

Merge branch 'asf-site' Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3dbc2e93 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3dbc2e93 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3dbc2e93

[19/37] usergrid git commit: Merge branch 'hotfix-20160819'

Merge branch 'hotfix-20160819' Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c65f9037 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c65f9037 Diff:

[23/37] usergrid git commit: Merge commit 'refs/pull/560/head' of github.com:apache/usergrid

Merge commit 'refs/pull/560/head' of github.com:apache/usergrid Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/04e49da5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/04e49da5 Diff: