You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/04 01:53:05 UTC
[3/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://github.com/mdunker/incubator-usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of https://github.com/mdunker/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/29f22332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/29f22332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/29f22332
Branch: refs/heads/two-dot-o-dev
Commit: 29f22332a1b5d5e29fad4e69b5a67b72790622ce
Parents: 6ad32c3 c5e1623
Author: GERey <gr...@apigee.com>
Authored: Mon Aug 3 16:52:50 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Mon Aug 3 16:52:50 2015 -0700
----------------------------------------------------------------------
.../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 | 5 +++
10 files changed, 137 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/29f22332/stack/pom.xml
----------------------------------------------------------------------