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/03/25 16:21:18 UTC
[19/43] git commit: Merge branch 'two-dot-o' of
github.com:usergrid/usergrid into asyncqueue
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into asyncqueue
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4901214c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4901214c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4901214c
Branch: refs/heads/two-dot-o
Commit: 4901214c69ff031ac37bb4f5761aace68eb7a402
Parents: 6db41cd 070f15b
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Mar 18 17:31:39 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Mar 18 17:31:39 2014 -0700
----------------------------------------------------------------------
stack/awscluster/cassandra-cf.json | 315 ---------
stack/awscluster/pom.xml | 6 +-
.../main/dist/init_instance/init_db_server.sh | 54 ++
.../main/dist/init_instance/init_instance.sh | 54 --
.../main/dist/init_instance/init_rest_server.sh | 41 ++
.../dist/init_instance/install_cassandra.sh | 63 +-
stack/awscluster/src/main/dist/update.sh | 16 +
.../src/main/groovy/configure_cassandra.groovy | 2 +-
.../src/main/groovy/configure_portal_new.groovy | 17 +
.../src/main/groovy/configure_usergrid.groovy | 126 ++++
stack/awscluster/ugcluster-cf.json | 647 +++++++++++++++++++
.../serialization/SerializationFig.java | 5 +
...MvccEntitySerializationStrategyImplTest.java | 57 +-
.../usergrid/persistence/index/IndexFig.java | 8 +-
.../index/impl/EsEntityCollectionIndex.java | 3 +-
.../persistence/index/impl/EsProvider.java | 53 +-
.../index/legacy/EntityManagerFacade.java | 200 ++++++
.../apache/usergrid/utils/EntityBuilder.java | 177 +++++
.../index/impl/EntityCollectionIndexTest.java | 2 +-
.../persistence/index/legacy/EntityBuilder.java | 177 -----
.../index/legacy/EntityManagerFacade.java | 200 ------
.../src/test/resources/dynamic-test.properties | 2 +-
.../src/test/resources/usergrid-CHOP.properties | 5 +-
.../src/test/resources/usergrid-UNIT.properties | 2 +-
stack/pom.xml | 1 -
25 files changed, 1388 insertions(+), 845 deletions(-)
----------------------------------------------------------------------