Fixing merge

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

Branch: refs/heads/1.2.x-fixes
Commit: 90431dbbf9e66f4443f7ddcefd24bc6c9746036f
Parents: 22d8ad9
Author: Colm O hEigeartaigh <[email protected]>
Authored: Fri Apr 21 11:01:01 2017 +0100
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Fri Apr 21 11:01:01 2017 +0100

----------------------------------------------------------------------
 release_notes.txt | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/90431dbb/release_notes.txt
----------------------------------------------------------------------
diff --git a/release_notes.txt b/release_notes.txt
index 8531aea..219bf5b 100644
--- a/release_notes.txt
+++ b/release_notes.txt
@@ -1,4 +1,4 @@
-Apache CXF Fediz 1.2.2 Release Notes
+Apache CXF Fediz 1.2.4 Release Notes
 ------------------------------------
 
 1. Overview
@@ -63,28 +63,6 @@ N.A.
 
 8. Specific issues, features, and improvements fixed in this version
 
-Release Notes - CXF-Fediz - Version 1.3.2
-
-Bug
-
-    [FEDIZ-185] - Make one of passiveRequestorEndpoint or 
passiveRequestorEndpointConstraint mandatory in the IDP
-    [FEDIZ-189] - Add support for absolute URLs in the logoutRedirectTo 
parameter
-    [FEDIZ-191] - The HomeRealmReminder cookie is not deleted after logout in 
the IdP
-    [FEDIZ-194] - NPE when restarting Fediz OIDC after using dynamic 
registration
-
-Improvement
-
-    [FEDIZ-173] - Cors support for js OIDC Implicit Flow
-    [FEDIZ-183] - Support logging out in the plugins via the "wa" parameter
-    [FEDIZ-186] - Add new logoutRedirectToConstraint plugin configuration 
parameter
-    [FEDIZ-193] - Add a way to support additional top level domains when 
registering OIDC clients
-    [FEDIZ-200] - Make one of logoutEndpoint or logoutEndpointConstraint 
mandatory in the IDP
-
-Task
-
-    [FEDIZ-174] - Update CXF version to 3.1.8-SNAPSHOT
-
-
 Release Notes - CXF-Fediz - Version 1.2.4
 
 Bug

Reply via email to