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 2014/01/21 22:21:31 UTC

[02/20] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o


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

Branch: refs/heads/two-dot-o
Commit: 0456561136bddc679a36bf0b19c5df872dcdf144
Parents: 879cd31 5a57e87
Author: Alex Karasulu <ak...@gmail.com>
Authored: Sun Jan 12 13:55:56 2014 +0200
Committer: Alex Karasulu <ak...@gmail.com>
Committed: Sun Jan 12 13:55:56 2014 +0200

----------------------------------------------------------------------
 .../org/usergrid/rest/applications/ApplicationResource.java    | 6 ------
 stack/rest/src/main/resources/swagger/applications.json        | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------