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/07/07 01:46:29 UTC
[5/5] incubator-usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b9af09eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b9af09eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b9af09eb
Branch: refs/heads/master
Commit: b9af09ebf90b0b687df1817695babfeaa43385b5
Parents: 7a95109 ab149ae
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Jul 6 19:20:44 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Jul 6 19:20:44 2015 -0400
----------------------------------------------------------------------
CHANGELOG | 3 +
LICENSE | 10 +
stack/LICENSE-2.0.txt | 202 -------------------
.../applications/assets/AssetResourceIT.java | 2 +-
.../src/test/resources/cat-larger-than-6mb.jpg | Bin 9799257 -> 0 bytes
.../src/test/resources/ship-larger-than-6mb.gif | Bin 0 -> 7407487 bytes
6 files changed, 14 insertions(+), 203 deletions(-)
----------------------------------------------------------------------