Merge branch 'master' into common-queries

2020-02-24 15:39:34 -07:00 · 2020-02-24 15:39:34 -07:00 · 5f88ed4406
parent b1c174b91f 711bcd72aa
commit 5f88ed4406
1 changed files with 5 additions and 2 deletions
--- a/content/v2.0/reference/flux/stdlib/built-in/transformations/join.md
+++ b/content/v2.0/reference/flux/stdlib/built-in/transformations/join.md
@ -69,10 +69,13 @@ _**Data type:** String_

 ###### Possible Values:
 - `inner`
-<!-- - `cross`
+
+<!--
+- `cross`
 - `left`
 - `right`
- `full` -->
+- `full`
+-->

 {{% note %}}
 The `on` parameter and the `cross` method are mutually exclusive.