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/04 16:59:00 UTC
[5/5] incubator-usergrid git commit: Merge branch 'USERGRID-705'
Merge branch 'USERGRID-705'
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4ca6e2c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4ca6e2c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4ca6e2c3
Branch: refs/heads/master
Commit: 4ca6e2c34fbd2e070dafb05769229665e4d08859
Parents: 49ae4ac c5187d2
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Jun 4 08:45:07 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Jun 4 08:45:07 2015 -0600
----------------------------------------------------------------------
.../index/query/tree/CpQueryFilterLexer.java | 3123 ------------------
.../index/query/tree/CpQueryFilterParser.java | 2501 --------------
.../usergrid/management/ManagementService.java | 5 +-
.../cassandra/ManagementServiceImpl.java | 47 +-
stack/tools/pom.xml | 18 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 128 +-
.../org/apache/usergrid/tools/ImportAdmins.java | 405 ++-
.../org/apache/usergrid/tools/ToolBase.java | 10 +-
stack/tools/src/main/resources/log4j.properties | 25 +-
.../usergrid/tools/ExportImportAdminsTest.java | 232 ++
...adata.usergrid-management.1433331614293.json | 85 +
...users.usergrid-management.1433331614293.json | 23 +
12 files changed, 680 insertions(+), 5922 deletions(-)
----------------------------------------------------------------------