GitHub user GERey opened a pull request:
https://github.com/apache/incubator-usergrid/pull/197
Usergrid 347
This merge includes the fixes in 493 and all of the tickets that fixed as
well.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-usergrid USERGRID-347
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-usergrid/pull/197.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 #197
----
commit ee2160657510012d3c31cfa794f70747d4023808
Author: GERey <[email protected]>
Date: 2015-03-18T23:56:07Z
Got generics working, but before is still broken. Starting refactor of rest
test framework.
commit ce6626d4ec7626525b16f77c0450dfc9993d965b
Author: GERey <[email protected]>
Date: 2015-03-19T20:01:39Z
Added fixes and corresponding changes to AdminUsersIT.
commit 3eae925da199e04ccab1b4600de71b1c1eede8c9
Author: GERey <[email protected]>
Date: 2015-03-19T22:13:14Z
Merge branch 'USERGRID-405' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-493
# By Todd Nine (38) and Shawn Feldman (18)
# Via Shawn Feldman (7) and others
* 'USERGRID-405' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (56 commits)
Optimizes import to avoid merge errors
Removed exception swallowing
Added test to prove issue
Fixes issue with repair logic with incorrect assumptions of version
ordering. Versions can appear in any order during arbitrary order by
statements.
Removed Hystrix. Causing thread OOM issues and not really used in
production.
Revert "fix for list types changing from string to int or whatever"
Second pass at fixing the merge
fix for list types changing from string to int or whatever
Added REST tier invocation for migrations.
WIP overwrite
Added more tests
Fixes bug in return type
Renames listener to complete.
Refactored plugins to allow a "bootstrap" system plugin.
Fixes bug with delete marking and incorrect return value
Refactored packages
Fixes incorrect system initialization order
Removed Hystrix for performance testing.
Upgraded plexus utils and fixes build concurrency issues with surefire
Temporarily removed test. Need to rebuild with plugin structure.
...
commit 298bfcf1cb3a02d8fd10d02d6eab46cdd14b20c9
Author: GERey <[email protected]>
Date: 2015-03-19T23:08:34Z
[USERGRID-493] Made tests use a superuser token by default. If they need
other kinds of tokens then they can set them in the tests according to their
needs.
Fixed
commit edbda76f29494cc78ca59afe04138af8a4ecfebf
Author: GERey <[email protected]>
Date: 2015-03-19T23:11:01Z
[USERGRID-335] Fixed logic-wise what was wrong with the
collectionResourceIT tests.
commit 8de43dc817d3400709048f02494842d69d6677a5
Author: GERey <[email protected]>
Date: 2015-03-20T19:46:35Z
Added fix for one of the failing tests in the class.
commit b94e21dbd614dc62a736c9e22c4a3569bc4da96b
Author: GERey <[email protected]>
Date: 2015-03-20T20:23:09Z
[USERGRID-347] Fixed tokenTtl.
commit a33ae23c79c4676fbd1b3c4485c1e9e252d04b74
Author: GERey <[email protected]>
Date: 2015-03-20T23:56:41Z
[USERGRID-347] Removed unneeded test.
Added Me endpoint along with generic that adds on queryParameters.
Added Me Token test.
commit d7734af907e975baad4887d153db62c330efa2e6
Author: GERey <[email protected]>
Date: 2015-03-23T18:12:33Z
Added /revokeToken and /revokeTokens resources to the rest test framework
Fixed remaining tests in AccessTokenIT.
Extended/fixed some bugs in NamedResource.
commit d263d36d877492b52491f2a418a5f58c209826ec
Author: GERey <[email protected]>
Date: 2015-03-23T18:28:57Z
Merge branch 'USERGRID-405' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-347
# By Shawn Feldman (26) and others
# Via Shawn Feldman (9) and Todd Nine (4)
* 'USERGRID-405' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (38 commits)
undo smaller queries
smaller queries
smaller queries
move initialize index
move initialize index
Updated load tests to match new index structure
Updated tests to also contain larger body for measuring performance with
more accurate entity size
changing tests to iterate fewer times
add delete back
add delete back
add delay on refresh for tests
add small sleep
search change
Updated surefire to be a single fork to avoid ClassNotFoundException
merge issues
Fixed logic issue in GeoIT test.
adding refresh retry
Fixes test that won't work when the system runs too quickly.
Fixes rebuild bug
Resolves class loader problems during test
...
----
---
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.
---
