Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix how driver properties are handled #1959

Closed
wants to merge 8 commits into from
Closed

Fix how driver properties are handled #1959

wants to merge 8 commits into from

Commits on Dec 3, 2020

  1. Merge pull request microsoft#1471 from microsoft/dev 

    Release | Merge dev to master for 9.1.1-preview release
    @ulvii
    ulvii committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    9e76aba View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2021

  1. Merge dev to master for 9.2.0 release (microsoft#1506) 

    Merge dev to master for 9.2.0 release (microsoft#1506)
    @peterbae
    peterbae committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    66ee808 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. done

    Milan Mimica committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    2de5557 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' 

    # Conflicts:
#	CHANGELOG.md
#	README.md
#	azure-pipelines.yml
#	build.gradle
#	mssql-jdbc_auth_LICENSE
#	pom.xml
#	src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerMSAL4JUtils.java
#	src/samples/adaptive/pom.xml
#	src/samples/alwaysencrypted/pom.xml
#	src/samples/azureactivedirectoryauthentication/pom.xml
#	src/samples/connections/pom.xml
#	src/samples/constrained/pom.xml
#	src/samples/dataclassification/pom.xml
#	src/samples/datatypes/pom.xml
#	src/samples/resultsets/pom.xml
#	src/samples/sparse/pom.xml
#	src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
#	src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
#	src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java
    Milan Mimica committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    5788959 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into fix_1958 

    # Conflicts:
#	CHANGELOG.md
#	README.md
#	azure-pipelines.yml
#	build.gradle
#	mssql-jdbc_auth_LICENSE
#	pom.xml
#	src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerMSAL4JUtils.java
#	src/samples/adaptive/pom.xml
#	src/samples/alwaysencrypted/pom.xml
#	src/samples/azureactivedirectoryauthentication/pom.xml
#	src/samples/connections/pom.xml
#	src/samples/constrained/pom.xml
#	src/samples/dataclassification/pom.xml
#	src/samples/datatypes/pom.xml
#	src/samples/resultsets/pom.xml
#	src/samples/sparse/pom.xml
#	src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
#	src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
#	src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java
    Milan Mimica committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    0f2c76b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into fix_1958 

    # Conflicts:
#	CHANGELOG.md
#	README.md
#	azure-pipelines.yml
#	build.gradle
#	mssql-jdbc_auth_LICENSE
#	pom.xml
#	src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerMSAL4JUtils.java
#	src/samples/adaptive/pom.xml
#	src/samples/alwaysencrypted/pom.xml
#	src/samples/azureactivedirectoryauthentication/pom.xml
#	src/samples/connections/pom.xml
#	src/samples/constrained/pom.xml
#	src/samples/dataclassification/pom.xml
#	src/samples/datatypes/pom.xml
#	src/samples/resultsets/pom.xml
#	src/samples/sparse/pom.xml
#	src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
#	src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java
    Milan Mimica committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    acf2ac4 View commit details
    Browse the repository at this point in the history

  5. revert

    Milan Mimica committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    f4a0483 View commit details
    Browse the repository at this point in the history

  6. revert

    Milan Mimica committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    560df5d View commit details
    Browse the repository at this point in the history