Merge branch 'logical-operator-precendence' into flux-0.25

content/v2.0/reference/cli/influxd/_index.md

@@ -36,7 +36,6 @@ influxd [command]
 | `-h`, `--help`         | Help for `influxd`                                                                     |            |
 | `--http-bind-address`  | Bind address for the REST HTTP API (default `:9999`)                                   | string     |
 | `--log-level`          | Supported log levels are debug, info, and error (default `info`)                       | string     |
-| `--protos-path`        | Path to protos on the filesystem (default `~/.influxdbv2/protos`)                      | string     |
 | `--reporting-disabled` | Disable sending telemetry data to https://telemetry.influxdata.com                     |            |
 | `--secret-store`       | Data store for secrets (bolt or vault) (default `bolt`)                                | string     |
 | `--store`              | Data store for REST resources (bolt or memory) (default `bolt`)                        | string     |

content/v2.0/reference/cli/influxd/run.md

@@ -38,7 +38,6 @@ influxd run
 | `-h`, `--help`         | Help for `run`                                                                     |            |
 | `--http-bind-address`  | Bind address for the REST HTTP API (default `:9999`)                                   | string     |
 | `--log-level`          | Supported log levels are debug, info, and error (default `info`)                       | string     |
-| `--protos-path`        | Path to protos on the filesystem (default `~/.influxdbv2/protos`)                      | string     |
 | `--reporting-disabled` | Disable sending telemetry data to https://telemetry.influxdata.com                     |            |
 | `--secret-store`       | Data store for secrets (bolt or vault) (default `bolt`)                                | string     |
 | `--store`              | Data store for REST resources (bolt or memory) (default `bolt`)                        | string     |

content/v2.0/reference/flux/language/operators.md

@@ -20,6 +20,10 @@ Flux includes the following types of operators:
 - [Literal constructors](#literal-constructors)
 - [Miscellaneous operators](#miscellaneous-operators)
 
+_Also see:_
+
+- [Operator precedence](#operator-precedence)
+
 ## Arithmetic operators
 Arithmetic operators take two numerical values (either literals or variables) and
 perform a calculation that returns a single numerical value.
@@ -114,9 +118,28 @@ Literal constructors define fixed values.
 | `""`     | String       |
 
 ## Miscellaneous operators
-| Operator | Description         | Example                     |
-|:--------:|:-----------         | -------                     |
-| `( )`    | Logical grouping    | `r._value / (r._value * 2)` |
-| `,`      | Sequence delimiter  | `item1, item2, item3`       |
-| `:`      | Key-value separator | `{name: "Bob"}`             |
-| `.`      | Dot reference       | `r._measurement`            |
+| Operator | Description                   | Example                     |
+|:--------:|:-----------                   | -------                     |
+| `( )`    | Logical grouping              | `r._value / (r._value * 2)` |
+| `,`      | Sequence delimiter            | `item1, item2, item3`       |
+| `:`      | Key-value separator           | `{name: "Bob"}`             |
+| `.`      | Member access / dot reference | `r._measurement`            |
+
+## Operator precedence
+The table below outlines operator precedence.
+Operators with a lower number have higher precedence.
+
+|Precedence | Operator  | Description                |
+|:--------- |:--------: |:-----------                |
+| 1         | `a()`     | Function call              |
+|           | `a[]`     | Member or index access     |
+|           | `.`       | Member access              |
+| 2         | `*` `/`   | Multiplication and division|
+| 3         | `+` `-`   | Addition and subtraction   |
+| 4         | `==` `!=` | Comparison operators       |
+|           | `<` `<=`  |                            |
+|           | `>` `>=`  |                            |
+|           | `=~` `!~` |                            |
+| 5         | `not`     | Unary logical expression   |
+| 6         | `and`     | Logical AND                |
+| 7         | `or`      | Logical OR                 |

content/v2.0/reference/flux/release-notes.md

@@ -9,10 +9,22 @@ menu:
 ---
 
 {{% note %}}
-_The latest release of InfluxDB v2.0 alpha includes **Flux v0.24.0**.
-Any newer versions of Flux will not be available until the next InfluxDB release._
+_The latest release of InfluxDB v2.0 alpha includes **Flux v0.25.0**.
+Though newer versions of Flux may be available, they will not be included with
+InfluxDB until the next InfluxDB v2.0 release._
 {{% /note %}}
 
+## v0.25.0 [2019-04-08]
+
+## Breaking changes
+- Fix logical operators (`and`, `or`) precedence.
+
+## Bug fixes
+- Omit space between unary operator and operand.
+- Format AST preserving operator precedence.
+
+---
+
 ## v0.24.0 [2019-04-01]
 
 ### Breaking changes
@@ -22,6 +34,8 @@ Any newer versions of Flux will not be available until the next InfluxDB release
 - Handle when a non-call expression is parsed as the pipe destination.
 - Add error message to Compile methods for empty Spec.
 
+---
+
 ## v0.23.0 [2019-03-26]
 
 ### Breaking changes