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/10/20 15:47:12 UTC

[44/50] [abbrv] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3914d687
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3914d687
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3914d687

Branch: refs/heads/two-dot-o-events
Commit: 3914d6874b29a744051682df3f3768807c9306ee
Parents: c27a090 3119319
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 17 18:07:27 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 17 18:07:27 2014 -0600

----------------------------------------------------------------------
 .../src/main/dist/init_instance/create_raid0.sh | 19 +++----
 .../dist/init_instance/create_raid0_2disks.sh   | 54 --------------------
 .../main/dist/init_instance/init_db_server.sh   |  2 +-
 .../main/dist/init_instance/init_es_server.sh   |  2 +-
 .../dist/init_instance/init_graphite_server.sh  |  4 +-
 .../main/dist/init_instance/init_rest_server.sh | 18 +++++--
 .../dist/init_instance/install_elasticsearch.sh |  3 ++
 .../main/groovy/configure_elasticsearch.groovy  |  5 +-
 .../src/main/groovy/configure_usergrid.groovy   | 13 ++---
 stack/awscluster/ugcluster-cf.json              | 28 ++++++++--
 10 files changed, 64 insertions(+), 84 deletions(-)
----------------------------------------------------------------------