diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2015-10-22 10:18:58 +0200 |
---|---|---|
committer | Stas Vilchik <vilchiks@gmail.com> | 2015-10-22 10:18:58 +0200 |
commit | c37f61652aac74a307a61dd63bd8a9873edafe9b (patch) | |
tree | a185e5930a8c0a64f3d0964ee040330cc279913b /sonar-application | |
parent | ec68a62ae54508acc9686276cbf98a0bcf9c46da (diff) | |
parent | 0a17a11e7e08f39558d11cd3cc311cd44fbe8900 (diff) | |
download | sonarqube-c37f61652aac74a307a61dd63bd8a9873edafe9b.tar.gz sonarqube-c37f61652aac74a307a61dd63bd8a9873edafe9b.zip |
Merge remote-tracking branch 'origin/branch-5.2'
Diffstat (limited to 'sonar-application')
-rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index fec2dca7d41..ae9b419daf3 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -38,7 +38,7 @@ #sonar.jdbc.url=jdbc:postgresql://localhost/sonar -#----- Microsoft SQLServer 2008/2012 +#----- Microsoft SQLServer 2008/2012/2014 and SQL Azure # A database named sonar must exist and its collation must be case-sensitive (CS) and accent-sensitive (AS) # Use the following connection string if you want to use integrated security with Microsoft Sql Server # Do not set sonar.jdbc.username or sonar.jdbc.password property if you are using Integrated Security |