Skip to content

Commit 236aab5

Browse files
committed
various PR validation fixes
1 parent 0f1ed17 commit 236aab5

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

articles/cost-management-billing/automate/transition-consumption-apis-cost-management-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ The following Consumption APIs are planned for deprecation. We recommend that yo
3737

3838
| **API** | **Recommended** | **Deprecation Status** |
3939
| --- | --- | --- |
40-
| [Usage Details API](/rest/api/consumption/usage-details/list) | [Cost Details API](/rest/api/cost-management/generate-cost-details-report) or [Exports](../costs/tutorial-export-acm-data.md) | Maintenance mode. Will be deprecated in the future. |
41-
| [Marketplaces API](migrate-consumption-marketplaces-api.md) | [Cost Details API](/rest/api/cost-management/generate-cost-details-report) or [Exports](../costs/tutorial-export-acm-data.md) | Maintenance mode. Will be deprecated in the future. |
40+
| [Usage Details API](/rest/api/consumption/usage-details/list) | [Cost Details API](/rest/api/cost-management/generate-cost-details-report) or [Exports](../costs/tutorial-improved-exports.md) | Maintenance mode. Will be deprecated in the future. |
41+
| [Marketplaces API](migrate-consumption-marketplaces-api.md) | [Cost Details API](/rest/api/cost-management/generate-cost-details-report) or [Exports](../costs/tutorial-improved-exports.md) | Maintenance mode. Will be deprecated in the future. |
4242

4343
## Related content
4444

articles/cost-management-billing/costs/tutorial-improved-exports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,4 +435,4 @@ At the time of export creation, you can name the *StorageContainer*, *StorageDir
435435

436436
## Next steps
437437

438-
- Learn more about exports at [Tutorial: Create and manage exported data](tutorial-export-acm-data.md).
438+
- For a comprehensive reference of all available datasets that you export, including the schema for current and historical versions, see [Cost Management dataset schema index](/azure/cost-management-billing/dataset-schema/schema-index).

articles/storage/common/storage-network-security.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,8 @@ The following table lists services that can access your storage account data if
636636
| Azure Cache for Redis | `Microsoft.Cache/Redis` | Enables access to storage accounts. [Learn more](../../azure-cache-for-redis/cache-managed-identity.md).|
637637
| Azure AI Search | `Microsoft.Search/searchServices` | Enables access to storage accounts for indexing, processing, and querying. |
638638
| Azure AI services | `Microsoft.CognitiveService/accounts` | Enables access to storage accounts. [Learn more](../..//cognitive-services/cognitive-services-virtual-networks.md).|
639-
<<<<<<< HEAD
640639
| Azure Container Registry | `Microsoft.ContainerRegistry/registries`| Through the ACR Tasks suite of features, enables access to storage accounts when you're building container images. |
641640
| Microsoft Cost Management | `Microsoft.CostManagementExports` | Enables export to storage accounts behind a firewall. [Learn more](../../cost-management-billing/costs/tutorial-improved-exports.md).|
642-
=======
643-
| Microsoft Cost Management | `Microsoft.CostManagementExports` | Enables export to storage accounts behind a firewall. [Learn more](../../cost-management-billing/costs/tutorial-export-acm-data.md).|
644-
>>>>>>> 5d01e8c8d6e5d5d5c42b347f80c1cd814525a1a1
645641
| Azure Databricks | `Microsoft.Databricks/accessConnectors` | Enables access to storage accounts. |
646642
| Azure Data Factory | `Microsoft.DataFactory/factories` | Enables access to storage accounts through the Data Factory runtime. |
647643
| Azure Data Explorer | `Microsoft.Kusto/Clusters` | Read data for ingestion and external tables, and write data to external tables. [Learn more](/azure/data-explorer/data-explorer-overview). |

0 commit comments

Comments
 (0)