You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/16 20:06:16 UTC
[25/50] 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/a00af86e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a00af86e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a00af86e
Branch: refs/heads/USERGRID-273
Commit: a00af86e18f6082723ab1022bcca9aa7bdce850a
Parents: 2b1a6dc 1e86343
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Feb 11 19:57:24 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Feb 11 19:57:24 2015 -0500
----------------------------------------------------------------------
.../main/dist/init_instance/init_rest_server.sh | 6 +-
.../main/dist/init_instance/install_collectd.sh | 347 +++++++++++++++++++
stack/awscluster/ugcluster-cf.json | 4 +-
3 files changed, 354 insertions(+), 3 deletions(-)
----------------------------------------------------------------------