You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/07/28 16:13:59 UTC
[3/3] incubator-usergrid git commit: Merge remote-tracking branch
'origin/asset-rest-fix' into USERGRID-880
Merge remote-tracking branch 'origin/asset-rest-fix' into USERGRID-880
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b7fd3005
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b7fd3005
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b7fd3005
Branch: refs/heads/USERGRID-880
Commit: b7fd3005131a949c6d307e4bff4d54827af90834
Parents: ab059f6 2c07cd9
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Jul 28 08:13:41 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Jul 28 08:13:41 2015 -0600
----------------------------------------------------------------------
.../applications/assets/AssetsResource.java | 37 ++++++++++++++++++--
.../main/resources/usergrid-rest-context.xml | 5 +--
2 files changed, 36 insertions(+), 6 deletions(-)
----------------------------------------------------------------------