You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/05 00:47:35 UTC
[2/4] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-685
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-685
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dfda3cf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dfda3cf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dfda3cf7
Branch: refs/heads/two-dot-o-dev
Commit: dfda3cf7b5e14c2a671820f3d80839a0c7beaf8b
Parents: b269520 6be835c
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Jun 2 15:11:30 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Jun 2 15:11:30 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 7 +-
.../corepersistence/index/IndexServiceImpl.java | 4 +-
.../corepersistence/util/CpNamingUtils.java | 5 +-
.../org/apache/usergrid/utils/UUIDUtils.java | 32 +------
.../org/apache/usergrid/persistence/GeoIT.java | 4 +-
.../apache/usergrid/utils/UUIDUtilsTest.java | 26 +++---
stack/core/src/test/resources/log4j.properties | 1 +
.../persistence/model/util/UUIDGenerator.java | 58 +------------
.../impl/SearchRequestBuilderStrategy.java | 50 +++++------
.../apache/usergrid/rest/NotificationsIT.java | 9 +-
.../rest/applications/ApplicationCreateIT.java | 20 ++---
.../applications/assets/AssetResourceIT.java | 22 +----
.../collection/CollectionsResourceIT.java | 11 +--
.../collection/devices/DevicesResourceIT.java | 3 +-
.../events/ApplicationRequestCounterIT.java | 64 +++-----------
.../applications/queries/GeoPagingTest.java | 4 +-
.../rest/filters/ContentTypeResourceIT.java | 68 ++++-----------
.../rest/management/ManagementResourceIT.java | 88 ++++++++++----------
.../rest/test/resource2point0/ClientSetup.java | 2 +-
.../endpoints/mgmt/MeResource.java | 4 +
.../endpoints/mgmt/OrgResource.java | 2 +-
.../assets/data/LocalFileBinaryStore.java | 39 +++++++--
.../migration/AppInfoMigrationPluginTest.java | 6 +-
23 files changed, 198 insertions(+), 331 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dfda3cf7/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dfda3cf7/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
----------------------------------------------------------------------