Skip to content

Commit

Permalink
Merge branch 'brettwooldridge:dev' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
msteiger committed Sep 28, 2022
2 parents 2cc9031 + 7e64826 commit c093379
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@ YourKit supports open source projects with its full-featured Java Profiler. Cli

Please perform changes and submit pull requests from the ``dev`` branch instead of ``master``. Please set your editor to use spaces instead of tabs, and adhere to the apparent style of the code you are editing. The ``dev`` branch is always more "current" than the ``master`` if you are looking to live life on the edge.

[Build Status]:https://travis-ci.com/brettwooldridge/HikariCP
[Build Status img]:https://travis-ci.com/brettwooldridge/HikariCP.svg?branch=dev
[Build Status]:https://app.travis-ci.com/brettwooldridge/HikariCP
[Build Status img]:https://app.travis-ci.com/brettwooldridge/HikariCP.svg?branch=dev

[Coverage Status]:https://codecov.io/gh/brettwooldridge/HikariCP
[Coverage Status img]:https://codecov.io/gh/brettwooldridge/HikariCP/branch/dev/graph/badge.svg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
import java.util.SortedMap;
import java.util.concurrent.TimeUnit;

import com.codahale.metrics.MetricRegistry;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.util.Enumeration;
import java.util.Map.Entry;
import java.util.Properties;

import javax.sql.DataSource;
Expand Down

0 comments on commit c093379

Please sign in to comment.