usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [7/8] incubator-usergrid git commit: Merge branch 'master' into ug2-doc-update
Date Wed, 05 Aug 2015 12:25:33 GMT
Merge branch 'master' into ug2-doc-update


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d97f378a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d97f378a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d97f378a

Branch: refs/heads/ug2-doc-update
Commit: d97f378ab3563f35c723c5b79fb2a74a5266c6ef
Parents: 3046c0a 16d1e39
Author: Dave Johnson <snoopdave@apache.org>
Authored: Tue Aug 4 16:45:55 2015 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Tue Aug 4 16:45:55 2015 -0400

----------------------------------------------------------------------
 LICENSE                                         | 49 ++++++++++----------
 .../org/apache/usergrid/utils/JsonUtils.java    |  2 +-
 .../ir/result/ShardFilterIteratorTest.java      |  8 +++-
 .../main/resources/toolsApplicationContext.xml  |  2 +-
 .../apache/usergrid/tools/ExportAppTest.java    | 26 ++++-------
 tlp-resolution.txt                              |  6 +--
 6 files changed, 43 insertions(+), 50 deletions(-)
----------------------------------------------------------------------



Mime
View raw message