Skip to content

Fix merging problem in ChangeLog.md #10212

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

Merged
merged 2 commits into from
Oct 9, 2019
Merged

Fix merging problem in ChangeLog.md #10212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a50e8f7
Fix merging problem caused by #10057 & #10074
isra-fel Oct 8, 2019
34208cb
Merge branch 'release-2019-10-15' into isra-fel-patch-2
erich-wang Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Sql/Sql/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
- Additional information about change #1
-->
## Upcoming Release
* Add support for setting Active Directory Administrator on Managed Instance

## Version 1.14.2
* Update example in reference documentation for `Get-AzSqlElasticPool`
* Added vCore example to creating an elastic pool (New-AzSqlElasticPool).
* Remove the validation of EmailAddresses and the check that EmailAdmins is not false in case EmailAddresses is empty in Set-AzSqlServerAdvancedThreatProtectionPolicy and Set-AzSqlDatabaseAdvancedThreatProtectionPolicy
* Enabled removal of server/database auditing settings when multiple diagnostic settings that enable audit category exist.
* Fix email addresses validation in multiple Sql Vulnerability Assessment cmdlets (Update-AzSqlDatabaseVulnerabilityAssessmentSetting, Update-AzSqlServerVulnerabilityAssessmentSetting, Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting and Update-AzSqlInstanceVulnerabilityAssessmentSetting).
* Add support for setting Active Directory Administrator on Managed Instance

## Version 1.14.1
* Update documentation of old Auditing cmdlets.
Expand Down