GitHub user GERey opened a pull request:
https://github.com/apache/incubator-usergrid/pull/172
Usergrid 418
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/GERey/incubator-usergrid USERGRID-418
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-usergrid/pull/172.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 #172
----
commit efb6e72dec2e68aaa3c839c22a1d819c619e912f
Author: grey <[email protected]>
Date: 2015-02-26T21:23:13Z
[USERGRID-422] Created rest test for the issue.
Added system,database,and setup resources for the rest test framework (RTF).
commit 19e73d66d3df03bcfab0cc42f3bdb6b2c075b571
Author: grey <[email protected]>
Date: 2015-03-03T19:44:46Z
Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid
into USERGRID-422
# By Shawn Feldman (15) and others
# Via Shawn Feldman (9) and others
* 'two-dot-o' of https://github.com/apache/incubator-usergrid: (24 commits)
This fixes many tests in ApplicationResourceIT. This is a technically a
merge but Usergrid 333 was already merged into two-dot-o.
Removing unnecessary test class and commented out dependencies.
Exclude Codehaus Jackson JAX-RS dependency, plus some better logging &
test improvements.
compilation
fix compilation
indexbuffer: update method names
index message comments
undo change
change config
add batching
Add futures to batch and refresh
Add batch of batches
add batches of batches
removing future, moving around some initialization code
add comments
add blocking queue
Adding metrics to cp
adding index buffer
Added test for user feeds and started testCaseSensitivity test.
Fixed another test that uses the superuser token, and added a different
endpoint to facilitate using the superuser token or the default endpoint.
...
commit 3004a452079c2d174a136edb15dacfa926e8043b
Author: grey <[email protected]>
Date: 2015-03-03T20:40:27Z
Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-422
# By grey (12) and Rod Simpson (1)
# Via grey (3) and Rod Simpson (1)
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Revert "Merge remote-tracking branch 'gerey/USERGRID-280' into
apache_usergrid/two-dot-o"
Removed test properties change, and some formatting. Added test for
properties and additionally added to management feed test.
Added comments to tests that didn't have any.
Added some more methods for users and organizations. Added comments on
resetpw viewables not working in test environment. Cleanup of imports. Added
fixes to remaining tests
Added two tests, one ignored due to issue detailed above the test, and
another for checking the passwords. Added a resetpw resource for rest test
framework.
Removed unused catalina rest tomcat.
Added reactivate endpoint to users in rest test framework. Added test to
prove that reactivate endpoint still works.
[USERGRID-280]Added a management user put endpoint to the rest test
framework. Created new ticket and added a test for that ticket .
[USERGRID-280] Added testTestUserNeedsNoConfirmation, this test currently
does not pass but due to test account issues
Added testSystemAdmin needs no confirmation test
Added fix for unconfirmedAdminUsersTest
Added additional admin confirmation tests and fixes for the token
resource.
Added testProperties RTF files.
Conflicts:
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
commit dcdb3930019cfc2bda45e21dd0b264374f6d5923
Author: grey <[email protected]>
Date: 2015-03-03T21:02:03Z
[USERGRID-422] Added test that proves issue.
commit 4588a01eba10e9868f2651de24469ed0b9672125
Author: grey <[email protected]>
Date: 2015-03-03T21:17:14Z
[USERGRID-418] Add a catch to ensure that if the database runs with the
application already existing it returns an ok.
Also adds a logger debug telling people what happens if they have the debug
flag.
----
---
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.
---
