On 18/04/2016 18:15, Christopher Schultz wrote: > All, > > On 4/18/16 12:36 PM, schu...@apache.org wrote: >> Author: schultz >> Date: Mon Apr 18 16:36:35 2016 >> New Revision: 1739786 >> >> URL: http://svn.apache.org/viewvc?rev=1739786&view=rev >> Log: >> Back-port r1715434 to make a web application's CredentialHandler available >> through a context attribute. > > I'm having trouble merging this with the 8.5.0 branch. Is that because > r1715434 pre-dates the branch? If so, what's the accepted practice for > "back-porting" this from current-trunk to current-branch? Just > manually-edit the svn:merge-info and manually-patch the branch?
Isn't the code is already there in 8.5.x ? Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
