usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [3/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://github.com/mdunker/incubator-usergrid into two-dot-o-dev
Date Mon, 03 Aug 2015 23:53:05 GMT
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 <greyes@apigee.com>
Authored: Mon Aug 3 16:52:50 2015 -0700
Committer: GERey <greyes@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
----------------------------------------------------------------------


Mime
View raw message