Skip to content

Commit

Permalink
Cleaned up conflicts / exactly_one_of / at_least_one_of documentation (
Browse files Browse the repository at this point in the history
…#9844) (#17083)

* Cleaned up conflicts / exactly_one_of / at_least_one_of documentation

Added documentation for at_least_one_of and clarified in examples that conflicts _excludes_ the current field, but the others _include_ it. Also added a note that these properties are not supported inside lists of nested objects.

Related: yaqs/316453740125093888

* Update field-reference.md
[upstream:2295649fcae72b3206565e83f39bc57e216aeca0]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Jan 23, 2024
1 parent ba650d9 commit bd712c2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .changelog/9844.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
5 changes: 5 additions & 0 deletions .teamcity/components/generated/packages.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ var packages = mapOf(
"displayName" to "Environment Variables",
"path" to "./google/envvar"
),
"fwmodels" to mapOf(
"name" to "fwmodels",
"displayName" to "Framework Models",
"path" to "./google/fwmodels"
),
"fwprovider" to mapOf(
"name" to "fwprovider",
"displayName" to "Framework Provider",
Expand Down

0 comments on commit bd712c2

Please sign in to comment.