GitHub user snoopdave opened a pull request:
https://github.com/apache/usergrid/pull/420
Fix tools so that they build in master
They've been broken for ages now. This PR updates them so that they will
compile and run, and it deletes some old tools that are no longer relevant for
Usergrid 2.x.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/usergrid USERGRID-872
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/usergrid/pull/420.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #420
----
commit b5144d058189c37a639fa29d67056c0c96ff8531
Author: Dave Johnson <[email protected]>
Date: 2015-07-22T15:16:33Z
Tools now able to compile again.
commit 9edb31c51bdfc1191569912e0bd0570a1bea9468
Author: Dave Johnson <[email protected]>
Date: 2015-10-30T20:00:35Z
Merge branch 'master' into USERGRID-872
Conflicts:
stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
commit 6db4af0fc7acc5c3f804f19ee928894163175ac7
Author: Dave Johnson <[email protected]>
Date: 2015-10-30T20:39:33Z
Restore original versions of these files.
commit b263446ab006fa77aa8e9b3e79f8f59edc1a6b7f
Author: Dave Johnson <[email protected]>
Date: 2015-10-30T20:58:00Z
Restore original versions of these files.
commit d04f6e3b6567ac539c5c0f48cc078536f931fb6c
Author: Dave Johnson <[email protected]>
Date: 2015-10-30T21:01:18Z
Restore original versions of these files.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
