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 2014/10/17 21:39:46 UTC
[1/2] git commit: Fixes graphite installation
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 68bd94fd0 -> f7ab17460
Fixes graphite installation
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e41021d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e41021d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e41021d0
Branch: refs/heads/two-dot-o
Commit: e41021d0c55863a79a43ecc793e5a3b02a1bb6e6
Parents: 2cdcf62
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 13:39:33 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 13:39:33 2014 -0600
----------------------------------------------------------------------
.../src/main/dist/init_instance/init_graphite_server.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e41021d0/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh b/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
index b095f2b..6b1c81a 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
@@ -58,6 +58,9 @@ groovy tag_instance.groovy BUILD-IN-PROGRESS
cd /usr/share/usergrid/init_instance
./install_oraclejdk.sh
+#Install graphite
+sudo docker run -d --name graphite -p 80:80 -p 2003:2003 -p 8125:8125/udp hopsoft/graphite-statsd
+
cd /usr/share/usergrid/scripts
groovy registry_register.groovy graphite
[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 to...@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/f7ab1746
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f7ab1746
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f7ab1746
Branch: refs/heads/two-dot-o
Commit: f7ab17460e4915a5593f635e0d2939deac3ef868
Parents: e41021d 68bd94f
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 13:39:41 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 13:39:41 2014 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 21 -
.../corepersistence/CpEntityManager.java | 2 +-
.../usergrid/corepersistence/CpWalker.java | 4 -
.../PerformanceEntityRebuildIndexTest.java | 17 +-
stack/pom.xml | 4 +-
stack/rest/src/main/webapp/WEB-INF/web.xml | 2 +-
.../usergrid/rest/management/AccessTokenIT.java | 381 ++++++++++---------
7 files changed, 218 insertions(+), 213 deletions(-)
----------------------------------------------------------------------