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:31 UTC
[40/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/4024da95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4024da95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4024da95
Branch: refs/heads/USERGRID-273
Commit: 4024da95c6d27792fac0e3ea1c758bb9c1ed226c
Parents: 3861bb8 6a2f92c
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Feb 13 17:06:02 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Feb 13 17:06:02 2015 -0500
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
.../org/apache/usergrid/scenarios/EntityScenarios.scala | 10 +++++-----
.../usergrid/simulations/PostCustomEntitySimulation.scala | 5 ++---
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------