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/08/26 16:52:10 UTC
[3/3] git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5e98e712
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5e98e712
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5e98e712
Branch: refs/heads/two-dot-o-notifications-queue
Commit: 5e98e712d0f5ae27607071c38394ffb0197d8f74
Parents: b712e39 981f4af
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Aug 26 08:51:35 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Aug 26 08:51:35 2014 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 14 ++++++----
stack/pom.xml | 8 ++++++
stack/rest/pom.xml | 11 +++++---
stack/services/pom.xml | 28 +++++++++++++-------
.../usergrid/cassandra/CassandraMain.java | 2 +-
.../usergrid/cassandra/CassandraResource.java | 4 +--
6 files changed, 45 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5e98e712/stack/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5e98e712/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index 600217c,0ff39ae..c212920
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -115,7 -115,11 +115,11 @@@
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
<elasticsearch.version>1.2.3</elasticsearch.version>
-
+ <metrics.version>3.0.0</metrics.version>
+ <usergrid.it.forkCount>3</usergrid.it.forkCount>
+ <usergrid.it.reuseForks>false</usergrid.it.reuseForks>
+ <usergrid.it.parallel>suites</usergrid.it.parallel>
+
</properties>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5e98e712/stack/services/pom.xml
----------------------------------------------------------------------