GitHub user GERey opened a pull request:
https://github.com/apache/incubator-usergrid/pull/200
Usergrid 460 merge
Contains the newest two-dot-o-dev merged with the older usergrid-460
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-usergrid USERGRID-460_merge
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-usergrid/pull/200.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 #200
----
commit 7c5b070215647137dde868fed1a47c03da96ebcf
Author: GERey <[email protected]>
Date: 2015-03-16T18:10:49Z
Created test that makes 10 cats and gets them back.
commit 65ff858dbf9b2e30a7322ad4612fd5d8a4120914
Author: GERey <[email protected]>
Date: 2015-03-16T20:15:23Z
Added test that checks entities written to a collection in reverse and
proves that locations queried are returned in collection order instead of
distance order.
commit 65c5e22d18d7eaba6e41ff7d84eb51365da6930d
Author: GERey <[email protected]>
Date: 2015-03-17T23:28:55Z
[USERGRID-460] Added ability to make geo sorts possible. Not Working.
Refacorted the query code for filterBuilders and queryBuilders in the Query
class.
commit 6f3824b8b4211b8170f4b504bb32058ebfbcc0d7
Author: GERey <[email protected]>
Date: 2015-03-17T23:45:53Z
[USERGRID-460] Fixed GeoPaging by adding correct sorting prefix.
commit 4964ab62a3c846721aef657b36002b2a549f1674
Author: GERey <[email protected]>
Date: 2015-03-18T20:20:12Z
Cleaned some of the GeoPagingTest comments and added a test that ensures
consistent order from elastic search.
commit 96340436963ff53297ea92ce5f7017f2de672bf8
Author: GERey <[email protected]>
Date: 2015-03-24T23:47:47Z
Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into HEAD
# By Todd Nine (73) and others
# Via Shawn Feldman (22) and others
* 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (149 commits)
[USERGRID-348] Added fixes for ExportResourceIT and changed Export
endpoint t use the old method of looking for payloads so that it is consistent
with imports.
[USERGRID-348] Fixed around half the tests for export rules
[USERGRID-348] Added first working test under ExportResourseIT. Found bug
using management gets with AppName so I created the ability to get with the
stored application uuid instead.
[USERGRID-502] Updated BasicIT to use the new rest test framework.
Removed token testing in BasicIt because token and other various permissions
are tested in their respective testing files. The test didn't add anything of
value to already existing tests.
Fixed an issue when multiple tests are run. Cleaned up and fixed
SystemResourceIT
Forgot header
[USERGRID-338] Fixed logic error in test.
Added /revokeToken and /revokeTokens resources to the rest test framework
Fixed remaining tests in AccessTokenIT. Extended/fixed some bugs in
NamedResource.
undo smaller queries
smaller queries
smaller queries
[USERGRID-347] Removed unneeded test. Added Me endpoint along with
generic that adds on queryParameters. Added Me Token test.
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
[USERGRID-347] Fixed tokenTtl.
...
Conflicts:
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
----
---
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.
---
