You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/20 19:26:57 UTC

[1/2] git commit: change default property value to turn off graphite

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o ee0f28c7a -> 3170b6a63


change default property value to turn off graphite


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

Branch: refs/heads/two-dot-o
Commit: a561cef4d7582ab52928527c9ee74031976550dc
Parents: 3914d68
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Oct 20 11:05:51 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Oct 20 11:05:51 2014 -0600

----------------------------------------------------------------------
 stack/config/src/main/resources/usergrid-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a561cef4/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------
diff --git a/stack/config/src/main/resources/usergrid-default.properties b/stack/config/src/main/resources/usergrid-default.properties
index 2e8ce0c..a4760dd 100644
--- a/stack/config/src/main/resources/usergrid-default.properties
+++ b/stack/config/src/main/resources/usergrid-default.properties
@@ -371,7 +371,7 @@ usergrid.management.email.user-pin=\
 
 
 # graphite server
-usergrid.metrics.graphite.host=badhost
+usergrid.metrics.graphite.host=false
 
 ###############################################################################
 #

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

Posted by sf...@apache.org.
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/3170b6a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3170b6a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3170b6a6

Branch: refs/heads/two-dot-o
Commit: 3170b6a6302b0e11372108cc50aceed6836d33b8
Parents: a561cef ee0f28c
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Oct 20 11:12:15 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Oct 20 11:12:15 2014 -0600

----------------------------------------------------------------------
 stack/awscluster/pom.xml                        |  2 +-
 .../main/dist/init_instance/init_rest_server.sh |  6 ++++-
 .../dist/init_instance/install_cassandra.sh     |  4 +++
 .../src/main/groovy/configure_cassandra.groovy  | 26 +-------------------
 stack/awscluster/ugcluster-cf.json              |  2 +-
 5 files changed, 12 insertions(+), 28 deletions(-)
----------------------------------------------------------------------