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 2015/02/06 15:46:34 UTC
[2/3] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8907dd03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8907dd03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8907dd03
Branch: refs/heads/two-dot-o-import
Commit: 8907dd03b5129b9f43c76194ad54764a91b8d1c7
Parents: b8dd3b1 5fc4714
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Feb 6 08:23:12 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Feb 6 08:23:12 2015 -0500
----------------------------------------------------------------------
stack/awscluster/src/main/cql/update_locks.cql | 2 +-
.../awscluster/src/main/cql/update_usergrid.cql | 2 +-
.../main/cql/update_usergrid_applications.cql | 2 +-
.../dist/init_instance/install_elasticsearch.sh | 12 +++---
.../main/dist/init_instance/update_keyspaces.sh | 9 ++++
.../src/main/groovy/configure_usergrid.groovy | 25 ++++++++----
stack/awscluster/ugcluster-cf.json | 18 +++++++-
.../management/importer/ImportService.java | 5 ---
.../management/importer/ImportServiceImpl.java | 43 ++++++++++++--------
.../services/queues/ImportQueueListener.java | 4 +-
10 files changed, 80 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8907dd03/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------