You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/07/07 20:16:38 UTC
[21/50] [abbrv] git commit: Merge branch 'master' of
https://github.com/usergrid/usergrid into USERGRID-176_fix-maven-3.2
Merge branch 'master' of https://github.com/usergrid/usergrid into USERGRID-176_fix-maven-3.2
# By Todd Nine (23) and others
# Via Todd Nine (5) and others
* 'master' of https://github.com/usergrid/usergrid: (42 commits)
Fixes bug and serializer re-use
Updated contribution section
Fixes issue with incorrect page size hint causing too many round trips during iteration.
Moved many updates to modules and rebuilt SDK
Added test to prove issue
updated assets sample in the README
fixed error in callback for download()
Added support for new assets functionality with attachAsset() and downloadAsset()
Removal of the log4j.xml.
Removed duplicate stdout appender. The same one is added in the properties file, so we do not need the same one in the xml.
Disabled query validator until we merge in ES changes.
Revert "Merge pull request #182 from GERey/fix-query-validator-tests"
Revert "Merge pull request #182 from GERey/fix-query-validator-tests"
Updates repair process to page through large organization counts.
Made test 1.6 compatible
Removed redundant casts
Revert "Updated source to be 1.7 compatible"
updated README to reflect info about git-wip as canonical source
Fixes subtraction issue with Sets.difference not working recursively.
Updated source to be 1.7 compatible
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6f4423e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6f4423e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6f4423e8
Branch: refs/pull/206/merge
Commit: 6f4423e8900c19b8c61016c6fc0c062f17f29a0e
Parents: 8cb1644 c7b8612
Author: grey <gr...@apigee.com>
Authored: Fri Jun 27 11:33:08 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Jun 27 11:33:08 2014 -0700
----------------------------------------------------------------------
README.md | 23 +-
sdks/html5-javascript/README.md | 76 ++--
sdks/html5-javascript/lib/modules/Asset.js | 168 ++++++---
sdks/html5-javascript/lib/modules/Entity.js | 179 +++++++++-
sdks/html5-javascript/lib/modules/Group.js | 2 +-
sdks/html5-javascript/usergrid.js | 237 +++++++++++--
sdks/html5-javascript/usergrid.min.js | 6 +-
sdks/nodejs/lib/usergrid.js | 156 +++++++++
.../main/resources/usergrid-default.properties | 3 +
stack/config/src/test/resources/log4j.xml | 40 ---
.../usergrid/mq/cassandra/QueueManagerImpl.java | 38 +-
.../mq/cassandra/io/AbstractSearch.java | 5 +-
.../mq/cassandra/io/ConsumerTransaction.java | 12 +-
.../cassandra/CassandraPersistenceUtils.java | 9 +-
.../persistence/cassandra/CassandraService.java | 137 ++------
.../cassandra/EntityManagerFactoryImpl.java | 5 +-
.../cassandra/EntityManagerImpl.java | 58 ++--
.../persistence/cassandra/GeoIndexManager.java | 23 +-
.../persistence/cassandra/QueryProcessor.java | 61 +---
.../cassandra/RelationManagerImpl.java | 59 ++--
.../persistence/cassandra/Serializers.java | 14 +-
.../persistence/hector/CountingMutator.java | 344 +++++++++++++++++++
.../usergrid/persistence/query/ir/AllNode.java | 6 +
.../persistence/query/ir/BooleanNode.java | 6 +
.../query/ir/EmailIdentifierNode.java | 6 +
.../query/ir/NameIdentifierNode.java | 6 +
.../usergrid/persistence/query/ir/NotNode.java | 6 +
.../persistence/query/ir/OrderByNode.java | 10 +-
.../persistence/query/ir/QueryNode.java | 6 +
.../persistence/query/ir/SliceNode.java | 6 +
.../query/ir/UuidIdentifierNode.java | 6 +
.../persistence/query/ir/WithinNode.java | 6 +
.../query/ir/result/SubtractionIterator.java | 2 +-
.../usergrid/persistence/CountingMutatorIT.java | 134 ++++++++
.../apache/usergrid/persistence/IndexIT.java | 4 +-
.../cassandra/QueryProcessorTest.java | 105 +++++-
.../query/IntersectionTransitivePagingIT.java | 165 +++++++++
.../query/IntersectionUnionPagingIT.java | 4 +-
.../persistence/query/NotSubPropertyIT.java | 178 ++++++++++
stack/core/src/test/resources/log4j.properties | 1 +
stack/pom.xml | 2 +-
.../apache/usergrid/rest/AbstractRestIT.java | 11 +
.../applications/users/MatrixQueryTests.java | 212 ++++++++++++
.../rest/test/resource/MatrixResource.java | 64 ++++
.../rest/test/resource/NamedResource.java | 5 +
.../rest/test/resource/SetResource.java | 12 +
.../rest/test/resource/ValueResource.java | 18 +-
.../usergrid/services/ServiceRequest.java | 11 +-
.../org/apache/usergrid/tools/AppNameFix.java | 59 +++-
.../RepairingMismatchedApplicationMetadata.java | 92 +++--
stack/tools/src/main/resources/log4j.properties | 45 +++
stack/tools/src/main/resources/log4j.xml | 29 --
52 files changed, 2356 insertions(+), 516 deletions(-)
----------------------------------------------------------------------