Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1c0f9313 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1c0f9313 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1c0f9313 Branch: refs/heads/two-dot-o Commit: 1c0f9313d27e96833bf1ade13b3cf0bf90a2dc25 Parents: 60055e4 c3f01dc Author: Shawn Feldman <[email protected]> Authored: Wed Nov 5 14:31:08 2014 -0700 Committer: Shawn Feldman <[email protected]> Committed: Wed Nov 5 14:31:08 2014 -0700 ---------------------------------------------------------------------- stack/awscluster/assembly.xml | 8 +- stack/awscluster/pom.xml | 379 +++++++++++-------- .../main/dist/init_instance/init_rest_server.sh | 12 + stack/awscluster/src/main/dist/update.sh | 16 +- .../main/groovy/configure_elasticsearch.groovy | 47 ++- .../src/main/groovy/configure_usergrid.groovy | 5 +- stack/awscluster/ugcluster-cf.json | 10 +- stack/pom.xml | 10 +- 8 files changed, 304 insertions(+), 183 deletions(-) ----------------------------------------------------------------------
