Merge branch '1.2.x'

2015-07-27 14:58:37 +02:00 · 2015-07-27 14:58:37 +02:00 · 4c5a1036a3
parent fdee56138d 3953baba81
commit 4c5a1036a3
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java
@ -86,7 +86,7 @@ enum DatabaseDriver {
 	/**
 	 * SQL Server
 	 */
-	SQLSERVER("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+	SQLSERVER("com.microsoft.sqlserver.jdbc.SQLServerDriver", "com.microsoft.sqlserver.jdbc.SQLServerXADataSource");

 	private final String driverClassName;