Merge branch '1.2.x'

4c5a1036 · Stephane Nicoll · fdee5613 · 3953baba · 4c5a1036
Commit 4c5a1036 authored Jul 27, 2015 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

DatabaseDriver.java ...ringframework/boot/autoconfigure/jdbc/DatabaseDriver.java +1 -1

No files found.
--- 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;