[01/19] usergrid git commit: Tools now able to compile again.

Repository: usergrid Updated Branches: refs/heads/master 2867d26d6 -> 41caeaa10 Tools now able to compile again. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b5144d05 Tree:

[06/19] usergrid git commit: Restore original versions of these files.

Restore original versions of these files. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6db4af0f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6db4af0f Diff:

[08/19] usergrid git commit: Restore original versions of these files.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d04f6e3b/stack/pom.xml -- diff --git a/stack/pom.xml b/stack/pom.xml index 2f74c67..c1ded77 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -17,1562 +17,1562 @@ -->

[17/19] usergrid git commit: Merge branch 'master' into USERGRID-872

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

[16/19] usergrid git commit: changes to get ExportAdmins working under 2.0, ExportApp is still failing.

changes to get ExportAdmins working under 2.0, ExportApp is still failing. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bdf518b4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bdf518b4 Diff:

[07/19] usergrid git commit: Restore original versions of these files.

Restore original versions of these files. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b263446a Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b263446a Diff:

[14/19] usergrid git commit: Merge branch 'master' into USERGRID-872

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

[12/19] usergrid git commit: Update tools to use 2.1.1 and add missing ES args to two export tools.

Update tools to use 2.1.1 and add missing ES args to two export tools. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bfeb91b4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bfeb91b4 Diff:

[05/19] usergrid git commit: Restore original versions of these files.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6db4af0f/stack/pom.xml -- diff --git a/stack/pom.xml b/stack/pom.xml index 8e79d2e..2f74c67 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -17,1562 +17,1562 @@ -->

[7/9] usergrid git commit: Moving test delay for index refresh to account for the time it takes for Usergrid to process the test documents into the index before asking Elasticsearch to refresh/flush t

Moving test delay for index refresh to account for the time it takes for Usergrid to process the test documents into the index before asking Elasticsearch to refresh/flush the index. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit:

[9/9] usergrid git commit: Merge branch 'master' into USERGRID-872

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

[2/9] usergrid git commit: Allow notification entities to be deleted if they are not currently in progress.

Allow notification entities to be deleted if they are not currently in progress. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/db26ba72 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/db26ba72 Diff:

[5/9] usergrid git commit: Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid

Merge branch 'release' 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/1cdefdb7 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1cdefdb7 Diff:

[6/9] usergrid git commit: Remove duplicate entity get from update by name/id paths. Requires caller to pass in entity to em.updateProperties. Check if debug is enabled in many placesbefore calling lo

Remove duplicate entity get from update by name/id paths. Requires caller to pass in entity to em.updateProperties. Check if debug is enabled in many placesbefore calling logger.debug. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit:

[4/9] usergrid git commit: Allow notification entities to be deleted if they are not in a state that represents "in progress".

Allow notification entities to be deleted if they are not in a state that represents "in progress". Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/208be571 Tree:

[8/9] usergrid git commit: Add some buffering to the permissions cache tests in case a slow c* cluster is being used.

Add some buffering to the permissions cache tests in case a slow c* cluster is being used. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2867d26d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2867d26d

usergrid git commit: Changed logging to debug and wrapped it in logger if.

Repository: usergrid Updated Branches: refs/heads/USERGRID-1187 5c70fbf86 -> dd8d02718 Changed logging to debug and wrapped it in logger if. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/dd8d0271 Tree:

[03/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/tests/performance/src/main/scala/org/apache/usergrid/enums/AuthType.scala -- diff --git a/tests/performance/src/main/scala/org/apache/usergrid/enums/AuthType.scala

[17/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/datafiles/dist.female.first.txt -- diff --git

[12/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/deprecated/PutCustomEntitySimulation.scala -- diff --git

[02/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/tests/performance/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala -- diff --git

[06/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/tests/performance/src/main/scala/org/apache/usergrid/datagenerators/datafiles/dist.female.first.txt -- diff --git

[19/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/stack/loadtests/runtests_deprecated.sh -- diff --git a/stack/loadtests/runtests_deprecated.sh b/stack/loadtests/runtests_deprecated.sh deleted file mode 100755 index

[07/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/tests/performance/src/main/scala/org/apache/usergrid/datagenerators/datafiles/dist.all.last.txt -- diff --git

[13/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala -- diff --git

[14/20] usergrid git commit: Moving load tests into top level tests directory. Adding node.js integration tests. Re-formatting stack/pom.xml.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/29bf682e/stack/loadtests/src/main/scala/org/apache/usergrid/enums/AuthType.scala -- diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/AuthType.scala

usergrid git commit: Removing usergrid-tools as the top level module. This module can be built separately as it's not critical to the deployment/testing of the main Usergrid application.

Repository: usergrid Updated Branches: refs/heads/master 41caeaa10 -> 96ea64ac9 Removing usergrid-tools as the top level module. This module can be built separately as it's not critical to the deployment/testing of the main Usergrid application. Project: