cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xl...@apache.org
Subject [2/2] git commit: Merge branch '2.7.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 2.7.x-fixes
Date Thu, 08 May 2014 03:05:14 GMT
Merge branch '2.7.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 2.7.x-fixes


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

Branch: refs/heads/2.7.x-fixes
Commit: f6d9f8114beb3d6ac191a0b86edac1c5eda30779
Parents: 051058e 2f57b6f
Author: xldai <xldai@talend.com>
Authored: Thu May 8 11:04:46 2014 +0800
Committer: xldai <xldai@talend.com>
Committed: Thu May 8 11:04:46 2014 +0800

----------------------------------------------------------------------
 .gitmergeinfo                                                    | 1 +
 .../demo/oauth/server/controllers/ApplicationController.java     | 4 ++--
 .../src/main/webapp/WEB-INF/views/authorizedClientsList.jsp      | 2 +-
 .../oauth/server/src/main/webapp/WEB-INF/views/clientDetails.jsp | 4 ++++
 .../src/main/webapp/WEB-INF/views/registeredClientsList.jsp      | 2 +-
 .../cxf/rs/security/oauth/services/RequestTokenService.java      | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



Mime
View raw message