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 2015/08/04 17:56:47 UTC
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ea9389cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ea9389cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ea9389cd
Branch: refs/heads/two-dot-o-dev
Commit: ea9389cd8e0555c953ceb261c48d6ae3904525a7
Parents: a1577b6 b9d2d35
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Aug 4 09:56:34 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Aug 4 09:56:34 2015 -0600
----------------------------------------------------------------------
stack/corepersistence/pom.xml | 2 +-
.../org/apache/usergrid/enums/AuthType.scala | 16 ++++++++++
.../usergrid/enums/ConfigProperties.scala | 16 ++++++++++
.../usergrid/enums/EndConditionType.scala | 16 ++++++++++
.../org/apache/usergrid/enums/EntityType.scala | 16 ++++++++++
.../apache/usergrid/enums/ScenarioType.scala | 16 ++++++++++
.../org/apache/usergrid/enums/TokenType.scala | 16 ++++++++++
.../usergrid/scenarios/AuditScenarios.scala | 32 ++++++++++++--------
.../org/apache/usergrid/settings/Settings.scala | 24 ++++++++++-----
.../src/test/resources/dummyAuditUuid.csv | 2 +-
stack/pom.xml | 8 ++++-
11 files changed, 140 insertions(+), 24 deletions(-)
----------------------------------------------------------------------