2016-09-10 12:22 GMT+02:00 <[email protected]>: > Author: elukey > Date: Sat Sep 10 10:22:56 2016 > New Revision: 1760148 > > URL: http://svn.apache.org/viewvc?rev=1760148&view=rev > Log: > Add proposal+vote for mod_proxy_fcgi > > Modified: > httpd/httpd/branches/2.4.x/ (props changed) > httpd/httpd/branches/2.4.x/STATUS > > Propchange: httpd/httpd/branches/2.4.x/ > ------------------------------------------------------------ > ------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat Sep 10 10:22:56 2016 > @@ -2,4 +2,4 @@ > /httpd/httpd/branches/2.4.17-protocols-http2:1701609-1705681 > /httpd/httpd/branches/revert-ap-ldap:1150158-1150173 > /httpd/httpd/branches/wombat-integration:723609-723841 > -/httpd/httpd/trunk:1200475,1200478,1200482,1200491, > 1200496,1200513,1200550,1200556,1200580,1200605,[...] > 1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446, > 1758558,1759984,1760018 >
The diff are my two commits proposed to backport, that have been probably tracked in my local repo, but I am ignorant about the topic so I am going to stop and wait for a more expert opinion. It was of course not intended, really sorry if I have caused any issue. IIUC I altered the mergeinfo tracking story with two commits that are not in 2.4.x yet, what would be the best way forward? Regards, Luca
