Author: markt
Date: Wed Sep 12 15:55:56 2018
New Revision: 1840712
URL: http://svn.apache.org/viewvc?rev=1840712&view=rev
Log:
Update DBCP merge info (no changes)
Modified:
tomcat/trunk/MERGE.txt
Modified: tomcat/trunk/MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1840712&r1=1840711&r2=1840712&view=diff
==============================================================================
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Wed Sep 12 15:55:56 2018
@@ -69,7 +69,7 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-abc048454398d8c9924a1af9c04501817f44a11d
+171528a88cca65f5b192be643c2425458d1edfbb
Pool2
Sub-tree
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
