You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/10/14 18:54:14 UTC

[18/39] usergrid git commit: Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release

Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release


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

Branch: refs/heads/usergrid-1007-shiro-cache
Commit: 175d5268fe5c74c4df7ad16fa6e2d2d370cfb77b
Parents: 5218cda cd623e6
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Sep 25 14:18:27 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Sep 25 14:18:27 2015 -0600

----------------------------------------------------------------------
 .../usergrid/management/AppInfoMigrationPlugin.java      | 11 +++++++++++
 .../services/assets/data/AwsSdkS3BinaryStore.java        | 11 ++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------