Merge remote-tracking branch 'ryan/APIBAAS-1362' into ryan-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/179bc18f Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/179bc18f Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/179bc18f Branch: refs/heads/key-row-sharding Commit: 179bc18f36ce7fd59ed615af9fba2993589880f0 Parents: 5fdbfa0 604d4f9 Author: Todd Nine <[email protected]> Authored: Tue Nov 4 15:47:12 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Tue Nov 4 15:47:12 2014 -0700 ---------------------------------------------------------------------- stack/awscluster/assembly.xml | 8 ++-- stack/awscluster/pom.xml | 66 +++++++++++++++++++-------- stack/awscluster/src/main/dist/update.sh | 16 +++---- stack/awscluster/ugcluster-cf.json | 24 ++++++---- stack/pom.xml | 10 ++-- 5 files changed, 79 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/179bc18f/stack/awscluster/ugcluster-cf.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/179bc18f/stack/pom.xml ----------------------------------------------------------------------
