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.

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

Rename master branch to main #8722

Merged
merged 1 commit into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/api-binary-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "API Binary Compatibility Checks"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delta-conversion-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Delta Conversion CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flink-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Flink CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hive-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Hive CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Java CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/open-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Open-API"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spark-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Spark CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ The core Java library that tracks table snapshots and metadata is complete, but

The [Iceberg format specification][iceberg-spec] is being actively updated and is open for comment. Until the specification is complete and released, it carries no compatibility guarantees. The spec is currently evolving as the Java reference implementation changes.

[Java API javadocs][iceberg-javadocs] are available for the master.
[Java API javadocs][iceberg-javadocs] are available for the main.

[iceberg-javadocs]: https://iceberg.apache.org/javadoc/master
[iceberg-javadocs]: https://iceberg.apache.org/javadoc/main
jbonofre marked this conversation as resolved.
Show resolved Hide resolved
[iceberg-spec]: https://iceberg.apache.org/spec


Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ subprojects {
"\nAPI/ABI breaks detected.\n" +
"Adding RevAPI breaks should only be done after going through a deprecation cycle." +
"\nPlease make sure to follow the deprecation rules defined in\n" +
"https://github.com/apache/iceberg/blob/master/CONTRIBUTING.md#semantic-versioning.\n" +
"https://github.com/apache/iceberg/blob/main/CONTRIBUTING.md#semantic-versioning.\n" +
"==================================================================================")
}
onlyIf {
Expand Down
2 changes: 1 addition & 1 deletion docs/flink-writes.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ FlinkSink.forRowData(input)
env.execute("Test Iceberg DataStream");
```

The iceberg API also allows users to write generic `DataStream<T>` to iceberg table, more example could be found in this [unit test](https://github.com/apache/iceberg/blob/master/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java).
The iceberg API also allows users to write generic `DataStream<T>` to iceberg table, more example could be found in this [unit test](https://github.com/apache/iceberg/blob/main/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java).

### Overwrite data

Expand Down
2 changes: 1 addition & 1 deletion docs/metrics-reporting.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ CommitReport{

### [`RESTMetricsReporter`](../../../javadoc/{{% icebergVersion %}}/org/apache/iceberg/rest/RESTMetricsReporter.html)

This is the default when using the [`RESTCatalog`](../../../javadoc/{{% icebergVersion %}}/org/apache/iceberg/rest/RESTCatalog.html) and its purpose is to send metrics to a REST server at the `/v1/{prefix}/namespaces/{namespace}/tables/{table}/metrics` endpoint as defined in the [REST OpenAPI spec](https://github.com/apache/iceberg/blob/master/open-api/rest-catalog-open-api.yaml).
This is the default when using the [`RESTCatalog`](../../../javadoc/{{% icebergVersion %}}/org/apache/iceberg/rest/RESTCatalog.html) and its purpose is to send metrics to a REST server at the `/v1/{prefix}/namespaces/{namespace}/tables/{table}/metrics` endpoint as defined in the [REST OpenAPI spec](https://github.com/apache/iceberg/blob/main/open-api/rest-catalog-open-api.yaml).

Sending metrics via REST can be controlled with the `rest-metrics-reporting-enabled` (defaults to `true`) property.

Expand Down