Merge branch 'master' of https://github.com/AlibabaTech/druid

Conflicts: src/main/java/com/alibaba/druid/pool/DruidDataSource.java src/main/java/com/alibaba/druid/pool/ha/DataSourceHolder.java
2023-03-04 19:17:16 +00:00 · 2011-12-20 22:46:19 +08:00
parent 03b41811ea 87ab582fdb
commit 41cc5cd57b
2 changed files with 4 additions and 2 deletions
@@ -1272,4 +1272,5 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
    public String getVersion() {
        return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion + "-2011-12-01 12:13";
    }
+
 }