(iceberg) branch 1.7.1rc0-cherry-picks updated: fix merge

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bryanck pushed a commit to branch 1.7.1rc0-cherry-picks
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/1.7.1rc0-cherry-picks by this push:
     new 06e4757133 fix merge
06e4757133 is described below

commit 06e475713317ef38a4e949b9c85d9ea9c71476d8
Author: Bryan Keller <bk...@netflix.com>
AuthorDate: Tue Nov 19 09:04:59 2024 -0800

    fix merge
---
 .../main/java/org/apache/iceberg/azure/adlsv2/ADLSLocation.java    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/azure/src/main/java/org/apache/iceberg/azure/adlsv2/ADLSLocation.java b/azure/src/main/java/org/apache/iceberg/azure/adlsv2/ADLSLocation.java
index deba414849..fb91c4cb32 100644
--- a/azure/src/main/java/org/apache/iceberg/azure/adlsv2/ADLSLocation.java
+++ b/azure/src/main/java/org/apache/iceberg/azure/adlsv2/ADLSLocation.java
@@ -39,13 +39,6 @@ import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
  * For compatibility, locations using the wasb scheme are also accepted but will use the Azure Data
  * Lake Storage Gen2 REST APIs instead of the Blob Storage REST APIs.
  *
- * or
- *
- * <pre>{@code wasb[s]://<container>@<storageAccount>.blob.core.windows.net/<path>}</pre>
- *
- * For compatibility, locations using the wasb scheme are also accepted but will use the Azure Data
- * Lake Storage Gen2 REST APIs instead of the Blob Storage REST APIs.
- *
  * <p>See <a
  * href="https://learn.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-introduction-abfs-uri#uri-syntax">Azure
  * Data Lake Storage URI</a>