From ef0708f7573f4de95b5ed14eca9d2bd92e22a7d4 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 08:08:32 -0600
Subject: [PATCH 01/11] added flux-0.36 to the changelog

---
 content/v2.0/reference/release-notes/flux.md | 31 +++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/content/v2.0/reference/release-notes/flux.md b/content/v2.0/reference/release-notes/flux.md
index c4bf927c9..3e1e82d30 100644
--- a/content/v2.0/reference/release-notes/flux.md
+++ b/content/v2.0/reference/release-notes/flux.md
@@ -11,11 +11,40 @@ aliases:
 ---
 
 {{% note %}}
-_The latest release of InfluxDB v2.0 alpha includes **Flux v0.35.1**.
+_The latest release of InfluxDB v2.0 alpha includes **Flux v0.36.1**.
 Though newer versions of Flux may be available, they will not be included with
 InfluxDB until the next InfluxDB v2.0 release._
 {{% /note %}}
 
+## v0.36.1 [2019-07-10]
+
+### Bug fixes
+- Add `range` call to some end-to-end tests.
+- Fix implementation of `strings.replaceAll`.
+
+---
+
+## v0.36.0 [2019-07-09]
+
+### Features
+- Refactored `movingAverage()`.
+- `elapsed()` function.
+- `mode()` function.
+- `sleep()` function.
+- Modify error usage in places to use the new enriched errors.
+- Enriched error interface.
+- End-to-end tests that show how to mimic pandas functionality.
+- End-to-end tests for string functions.
+
+### Bug fixes
+- Fix `difference()` so that it returns an error instead of panicking when given a `_time` column.
+- Added end-to-end tests for type conversion functions.
+- Make `map()` error if return type is not an object.
+- Fixed miscounted allocations in the `ColListTableBuilder`.
+- Support formatting `with`.
+
+---
+
 ## v0.35.1 [2019-07-03]
 
 ### Bug fixes

From 860ee180c1f0b9cd7ce845c5eeebc6194d927941 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 10:35:28 -0600
Subject: [PATCH 02/11] refactored movingAverage and added timedMovingAverage,
 resolves #311

---
 .../aggregates/movingaverage.md               | 95 +++++++++----------
 .../aggregates/timedmovingaverage.md          | 69 ++++++++++++++
 content/v2.0/reference/release-notes/flux.md  |  2 +-
 layouts/partials/article/related.html         |  2 +-
 4 files changed, 114 insertions(+), 54 deletions(-)
 create mode 100644 content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md

diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
index d4f2c92f8..038f17258 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
@@ -1,85 +1,76 @@
 ---
 title: movingAverage() function
 description: >
-  The `movingAverage()` function calculates the mean of values in a defined time
-  range at a specified frequency.
+  The `movingAverage()` function calculates the the mean of values grouped into `n` number of points.
 menu:
   v2_0_ref:
     name: movingAverage
     parent: built-in-aggregates
 weight: 501
+related:
+  - /v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage/
+  - https://docs.influxdata.com/influxdb/latest/query_language/functions/#moving-average, InfluxQL MOVING_AVERAGE()
 ---
 
-The `movingAverage()` function calculates the mean of values in a defined time
-range at a specified frequency.
+The `movingAverage()` function calculates the mean of values grouped into `n` number of points.
 
 _**Function type:** Aggregate_  
 
 ```js
 movingAverage(
-  every: 1d,
-  period: 5d,
-  column="_value",
-  timeSrc="_stop",
-  timeDst="_time",
+  n: 5,
+  columns: ["_value"]
 )
 ```
 
+##### Moving average rules:
+- The average over a period populated by `n` values is equal to their algebraic mean.
+- The average over a period populated by only `null` values is `null`.
+- Moving averages skip `null` values.
+- If `n` is less than the number of records in a table, `movingAverage` returns
+  the average of the available values.
+
 ## Parameters
 
-### every
-The frequency of time windows.
+### n
+The number of points to mean.
 
-_**Data type:** Duration_
+_**Data type:** Integer_
 
-### period
-The length of each averaged time window.
-_A negative duration indicates start and stop boundaries are reversed._
+### columns
+Columns to operate on. _Defaults to `["_value"]`_.
 
-_**Data type:** Duration_
-
-### column
-The column used to compute the moving average.
-Defaults to `"_value"`.
-
-_**Data type:** String_
-
-### timeSrc
-The column used as the source for the aggregated time.
-Defaults to `"_stop"`.
-
-_**Data type:** String_
-
-### timeDst
-The column in which to store the aggregated time.
-Defaults to `"_time"`.
-
-_**Data type:** String_
+_**Data type:** Array of Strings_
 
 ## Examples
 
-###### Calculate a five year moving average every year
+#### Calculate a five point moving average
 ```js
 from(bucket: "example-bucket"):
-  |> range(start: -7y)
-  |> filter(fn: (r) =>
-    r._measurement == "financial" and
-    r._field == "closing_price"
-  )
-  |> movingAverage(every: 1y, period: 5y)
+  |> range(start: -12h)
+  |> movingAverage(n: 5)
 ```
 
-## Function definition
+#### Moving average table transformation
+
+###### Input table:
+| _time |   A  |   B  |   C  |   D  | tag |
+|:-----:|:----:|:----:|:----:|:----:|:---:|
+|  0001 | null |   1  |   2  | null |  tv |
+|  0002 |   6  |   2  | null | null |  tv |
+|  0003 |   4  | null |   4  |   4  |  tv |
+
+###### Query:
 ```js
-movingAverage = (every, period, column="_value", timeSrc="_stop", timeDst="_time", tables=<-) =>
-  tables
-    |> window(every: every, period: period)
-    |> mean(column: column)
-    |> duplicate(column: timeSrc, as: timeDst)
-    |> window(every: inf)
+// ...
+  |> movingAverage(
+    n: 2,
+    columns: ["A", "B", "C", "D"]
+  )
 ```
 
-<hr style="margin-top:4rem"/>
-
-##### Related InfluxQL functions and statements:
-[MOVING_AVERAGE()](https://docs.influxdata.com/influxdb/latest/query_language/functions/#moving-average)  
+###### Output table:
+| _time |   A  |   B  |   C  |   D  | tag |
+|:-----:|:----:|:----:|:----:|:----:|:---:|
+|  0002 |   6  |  1.5 |   2  | null |  tv |
+|  0003 |   5  |   2  |   4  |   4  |  tv |
diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md
new file mode 100644
index 000000000..4aef93f1a
--- /dev/null
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md
@@ -0,0 +1,69 @@
+---
+title: timedMovingAverage() function
+description: >
+  The `timedMovingAverage()` function calculates the mean of values in a defined time
+  range at a specified frequency.
+menu:
+  v2_0_ref:
+    name: timedMovingAverage
+    parent: built-in-aggregates
+weight: 501
+related:
+  - /v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage/
+  - https://docs.influxdata.com/influxdb/latest/query_language/functions/#moving-average, InfluxQL MOVING_AVERAGE()
+---
+
+The `timedMovingAverage()` function calculates the mean of values in a defined time
+range at a specified frequency.
+
+_**Function type:** Aggregate_  
+
+```js
+timedMovingAverage(
+  every: 1d,
+  period: 5d,
+  column="_value"
+)
+```
+
+## Parameters
+
+### every
+The frequency of time windows.
+
+_**Data type:** Duration_
+
+### period
+The length of each averaged time window.
+_A negative duration indicates start and stop boundaries are reversed._
+
+_**Data type:** Duration_
+
+### column
+The column used to compute the moving average.
+Defaults to `"_value"`.
+
+_**Data type:** String_
+
+## Examples
+
+###### Calculate a five year moving average every year
+```js
+from(bucket: "example-bucket"):
+  |> range(start: -7y)
+  |> filter(fn: (r) =>
+    r._measurement == "financial" and
+    r._field == "closing_price"
+  )
+  |> timedMovingAverage(every: 1y, period: 5y)
+```
+
+## Function definition
+```js
+timedMovingAverage = (every, period, column="_value", tables=<-) =>
+  tables
+    |> window(every: every, period: period)
+    |> mean(column:column)
+    |> duplicate(column: "_stop", as: "_time")
+    |> window(every: inf)
+```
diff --git a/content/v2.0/reference/release-notes/flux.md b/content/v2.0/reference/release-notes/flux.md
index 3e1e82d30..456b29016 100644
--- a/content/v2.0/reference/release-notes/flux.md
+++ b/content/v2.0/reference/release-notes/flux.md
@@ -27,7 +27,7 @@ InfluxDB until the next InfluxDB v2.0 release._
 ## v0.36.0 [2019-07-09]
 
 ### Features
-- Refactored `movingAverage()`.
+- Updated `movingAverage()` and added `timedMovingAverage`.
 - `elapsed()` function.
 - `mode()` function.
 - `sleep()` function.
diff --git a/layouts/partials/article/related.html b/layouts/partials/article/related.html
index 7bbe046e0..7817ad286 100644
--- a/layouts/partials/article/related.html
+++ b/layouts/partials/article/related.html
@@ -4,7 +4,7 @@
     <ul>
     {{ range .Params.related }}
       {{ if in . "http" }}
-        {{ $link := replaceRE `\,\s(...)*$` "" . }}
+        {{ $link := replaceRE `\,\s(.*)$` "" . }}
         {{ $title := replaceRE `^(\S*\,\s)` "" . }}
         <li><a href="{{ $link }}" target="_blank">{{ $title }}</a></li>
       {{ else }}

From 98e58545836eeca06057eb4d1753287829992474 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 10:59:50 -0600
Subject: [PATCH 03/11] added the elapsed() function, resolved #304

---
 .../built-in/transformations/elapsed.md       | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md

diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md b/content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md
new file mode 100644
index 000000000..896635862
--- /dev/null
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md
@@ -0,0 +1,54 @@
+---
+title: elapsed() function
+description: The `elapsed()` function .returns the elapsed time between subsequent records.
+menu:
+  v2_0_ref:
+    name: elapsed
+    parent: built-in-transformations
+weight: 401
+---
+
+The `elapsed()` function returns the elapsed time between subsequent records.
+Given an input table, `elapsed` will return the same table with an additional
+`elapsed` column and without the first record as elapsed time is not defined.
+
+_**Function type:** Transformation_  
+
+```js
+elapsed(
+  unit: 1s,
+  timeColumn: "_time",
+  columnName: "elapsed"
+)
+```
+
+_`elapsed()` returns an errors if the `timeColumn` is not present in the input table._
+
+## Parameters
+
+### unit
+The unit in which the elapsed time is returned.
+_Defaults to `1s`._
+
+_**Data type:** Duration_
+
+### timeColumn
+Name of the column to use to compute the elapsed time.
+_Defaults to `"_time"`._
+
+_**Data type:** String_
+
+### columnName
+Name of the column in which to store elapsed times.
+_Defaults to `"elapsed"`._
+
+_**Data type:** String_
+
+## Examples
+
+##### Calculate the time between points in seconds
+```js
+from(bucket: "example-bucket")
+	|> range(start: -5m)
+	|> elapsed(unit: 1s)
+```

From de4f0eba6b29785ad6ff8d3e96c9a17bdc34c7ec Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 11:10:26 -0600
Subject: [PATCH 04/11] updated mode() function, resolves #308

---
 .../built-in/transformations/aggregates/mode.md   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md
index abbbfc86a..097e34150 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md
@@ -8,7 +8,6 @@ menu:
     name: mode
     parent: built-in-aggregates
 weight: 501
-draft: true
 ---
 
 The `mode()` function computes the mode or value that occurs most often in a
@@ -20,6 +19,18 @@ _**Function type:** Aggregate_
 mode(column: "_value")
 ```
 
+If there are multiple modes, all are returned in a table in sorted order.
+If there is no mode, `mode()` returns `null`.
+
+##### Supported data types
+
+- String
+- Float
+- Integer
+- UInteger
+- Boolean
+- Time
+
 ## Parameters
 
 ### column
@@ -30,7 +41,7 @@ _**Data type:** String_
 
 ## Examples
 
-###### Mode as an aggregate
+###### Return the mode of windowed data
 ```js
 from(bucket: "example-bucket")
   |> filter(fn: (r) =>

From 920a0abe879889c1bca701433396b4c1c27cbcb0 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 12:08:15 -0600
Subject: [PATCH 05/11] added the sleep() function, resolves #310

---
 .../flux/functions/built-in/misc/sleep.md     | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 content/v2.0/reference/flux/functions/built-in/misc/sleep.md

diff --git a/content/v2.0/reference/flux/functions/built-in/misc/sleep.md b/content/v2.0/reference/flux/functions/built-in/misc/sleep.md
new file mode 100644
index 000000000..094849f35
--- /dev/null
+++ b/content/v2.0/reference/flux/functions/built-in/misc/sleep.md
@@ -0,0 +1,49 @@
+---
+title: sleep() function
+description: The `sleep()` function delays execution by a specified duration.
+menu:
+  v2_0_ref:
+    name: sleep
+    parent: built-in-misc
+weight: 401
+---
+
+The `sleep()` function delays execution by a specified duration.
+
+_**Function type:** Miscellaneous_
+
+```js
+sleep(
+  v: x,
+  duration: 10s
+)
+```
+
+## Parameters
+
+### v
+The pipe parameter that defines input tables.
+
+_**Data type:** Object_
+
+### duration
+The amount of time execution should be delayed.
+
+_**Data type:** Duration_
+
+## Examples
+
+### Delay execution in a chained query
+```js
+from(bucket: "example-bucket")
+  |> range(start: -1h)
+  |> sleep(duration: 10s)
+```
+
+### Delay execution using a stream variable
+```js
+x = from(bucket: "example-bucket")
+    |> range(start: -1h)
+
+sleep(v: x, duration: 10s)
+```

From b6d2908bcd14cb6119ebeba485bb67689b96f1de Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 12:18:24 -0600
Subject: [PATCH 06/11] added breaking changes to the flux 0.36 release notes

---
 content/v2.0/reference/release-notes/flux.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/content/v2.0/reference/release-notes/flux.md b/content/v2.0/reference/release-notes/flux.md
index 456b29016..97b7351b3 100644
--- a/content/v2.0/reference/release-notes/flux.md
+++ b/content/v2.0/reference/release-notes/flux.md
@@ -43,6 +43,10 @@ InfluxDB until the next InfluxDB v2.0 release._
 - Fixed miscounted allocations in the `ColListTableBuilder`.
 - Support formatting `with`.
 
+### Breaking changes
+- Updated `movingAverage()` to `timedMovingAverage` and added new
+  `movingAverage()` implementation.
+
 ---
 
 ## v0.35.1 [2019-07-03]

From f1c2500f9d376bf5204e36dff47098e9f6cea351 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 15:49:29 -0600
Subject: [PATCH 07/11] updates to movingAverage to address PR feedback

---
 .../built-in/transformations/aggregates/movingaverage.md      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
index 038f17258..98854bf05 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
@@ -1,7 +1,7 @@
 ---
 title: movingAverage() function
 description: >
-  The `movingAverage()` function calculates the the mean of values grouped into `n` number of points.
+  The `movingAverage()` function calculates the mean of values grouped into `n` number of points.
 menu:
   v2_0_ref:
     name: movingAverage
@@ -33,7 +33,7 @@ movingAverage(
 ## Parameters
 
 ### n
-The number of points to mean.
+The number of points to average.
 
 _**Data type:** Integer_
 

From b72b6b2af8be25577e5714b988759b93e642e746 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 16:13:42 -0600
Subject: [PATCH 08/11] added more examples to moving average docs

---
 .../transformations/aggregates/movingaverage.md     |  9 ++++++++-
 .../aggregates/timedmovingaverage.md                | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
index 98854bf05..04d44a8ae 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
@@ -51,7 +51,14 @@ from(bucket: "example-bucket"):
   |> movingAverage(n: 5)
 ```
 
-#### Moving average table transformation
+#### Calculate a ten point moving average
+```js
+from(bucket: "example-bucket"):
+  |> range(start: -12h)
+  |> movingAverage(n: 10)
+```
+
+#### Table transformation with a two point moving average
 
 ###### Input table:
 | _time |   A  |   B  |   C  |   D  | tag |
diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md
index 4aef93f1a..acaedcbe8 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/timedmovingaverage.md
@@ -47,7 +47,7 @@ _**Data type:** String_
 
 ## Examples
 
-###### Calculate a five year moving average every year
+###### Calculate a seven day moving average every day
 ```js
 from(bucket: "example-bucket"):
   |> range(start: -7y)
@@ -58,6 +58,17 @@ from(bucket: "example-bucket"):
   |> timedMovingAverage(every: 1y, period: 5y)
 ```
 
+###### Calculate a five year moving average every year
+```js
+from(bucket: "example-bucket"):
+  |> range(start: -50d)
+  |> filter(fn: (r) =>
+    r._measurement == "financial" and
+    r._field == "closing_price"
+  )
+  |> timedMovingAverage(every: 1d, period: 7d)
+```
+
 ## Function definition
 ```js
 timedMovingAverage = (every, period, column="_value", tables=<-) =>

From cda89d879aabf6fc4f33e1053bae5e71a16c2e87 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 11 Jul 2019 16:34:51 -0600
Subject: [PATCH 09/11] updated function docs to address PR feedback

---
 .../flux/functions/built-in/misc/sleep.md          |  8 ++++++--
 .../built-in/transformations/aggregates/mode.md    |  2 +-
 .../functions/built-in/transformations/elapsed.md  | 14 +++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/content/v2.0/reference/flux/functions/built-in/misc/sleep.md b/content/v2.0/reference/flux/functions/built-in/misc/sleep.md
index 094849f35..7e6221048 100644
--- a/content/v2.0/reference/flux/functions/built-in/misc/sleep.md
+++ b/content/v2.0/reference/flux/functions/built-in/misc/sleep.md
@@ -22,12 +22,16 @@ sleep(
 ## Parameters
 
 ### v
-The pipe parameter that defines input tables.
+Defines input tables.
+`sleep()` accepts piped-forward data and passes it on unmodified after the
+specified [duration](#duration).
+If data is not piped-forward into `sleep()`, set `v` to specify a stream object.
+The examples [below](#examples) illustrate how.
 
 _**Data type:** Object_
 
 ### duration
-The amount of time execution should be delayed.
+The length of time to delay execution.
 
 _**Data type:** Duration_
 
diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md
index 097e34150..ef3916c57 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/mode.md
@@ -19,7 +19,7 @@ _**Function type:** Aggregate_
 mode(column: "_value")
 ```
 
-If there are multiple modes, all are returned in a table in sorted order.
+Multiple modes are returned in a sorted table.
 If there is no mode, `mode()` returns `null`.
 
 ##### Supported data types
diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md b/content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md
index 896635862..0c410b1f0 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/elapsed.md
@@ -1,6 +1,6 @@
 ---
 title: elapsed() function
-description: The `elapsed()` function .returns the elapsed time between subsequent records.
+description: The `elapsed()` function returns the time between subsequent records.
 menu:
   v2_0_ref:
     name: elapsed
@@ -8,9 +8,9 @@ menu:
 weight: 401
 ---
 
-The `elapsed()` function returns the elapsed time between subsequent records.
-Given an input table, `elapsed` will return the same table with an additional
-`elapsed` column and without the first record as elapsed time is not defined.
+The `elapsed()` function returns the time between subsequent records.
+Given an input table, `elapsed()` returns the same table without the first record
+(as elapsed time is not defined) and an additional column containing the elapsed time.
 
 _**Function type:** Transformation_  
 
@@ -27,19 +27,19 @@ _`elapsed()` returns an errors if the `timeColumn` is not present in the input t
 ## Parameters
 
 ### unit
-The unit in which the elapsed time is returned.
+The unit time to returned.
 _Defaults to `1s`._
 
 _**Data type:** Duration_
 
 ### timeColumn
-Name of the column to use to compute the elapsed time.
+The column to use to compute the elapsed time.
 _Defaults to `"_time"`._
 
 _**Data type:** String_
 
 ### columnName
-Name of the column in which to store elapsed times.
+The column to store elapsed times.
 _Defaults to `"elapsed"`._
 
 _**Data type:** String_

From 06660e9d752dcfc2d425b7739e15b1b2b322910e Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Fri, 12 Jul 2019 13:35:35 -0600
Subject: [PATCH 10/11] added  flux 0.36.2 to the release notes

---
 content/v2.0/reference/release-notes/flux.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/content/v2.0/reference/release-notes/flux.md b/content/v2.0/reference/release-notes/flux.md
index 97b7351b3..2153c4f87 100644
--- a/content/v2.0/reference/release-notes/flux.md
+++ b/content/v2.0/reference/release-notes/flux.md
@@ -16,6 +16,14 @@ Though newer versions of Flux may be available, they will not be included with
 InfluxDB until the next InfluxDB v2.0 release._
 {{% /note %}}
 
+## v0.36.2 [2019-07-12]
+
+### Bug fixes
+- Add helper methods for comparing entire result sets.
+- Map will not panic when a record is `null`.
+
+---
+
 ## v0.36.1 [2019-07-10]
 
 ### Bug fixes

From abee486c28c53706aff4d42e09e05e50810b674e Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Mon, 15 Jul 2019 15:51:08 -0600
Subject: [PATCH 11/11] resolved merge conflict with master

---
 .../transformations/aggregates/movingaverage.md   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
index eaf3e4a8c..60c08af83 100644
--- a/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
+++ b/content/v2.0/reference/flux/functions/built-in/transformations/aggregates/movingaverage.md
@@ -18,14 +18,8 @@ _**Function type:** Aggregate_
 
 ```js
 movingAverage(
-<<<<<<< HEAD
   n: 5,
   columns: ["_value"]
-=======
-  every: 1d,
-  period: 5d,
-  column="_value"
->>>>>>> master
 )
 ```
 
@@ -38,7 +32,6 @@ movingAverage(
 
 ## Parameters
 
-<<<<<<< HEAD
 ### n
 The number of points to average.
 
@@ -49,8 +42,6 @@ Columns to operate on. _Defaults to `["_value"]`_.
 
 _**Data type:** Array of Strings_
 
-=======
->>>>>>> master
 ## Examples
 
 #### Calculate a five point moving average
@@ -62,18 +53,12 @@ from(bucket: "example-bucket"):
 
 #### Calculate a ten point moving average
 ```js
-<<<<<<< HEAD
-from(bucket: "example-bucket"):
-  |> range(start: -12h)
-  |> movingAverage(n: 10)
-=======
 movingAverage = (every, period, column="_value", tables=<-) =>
   tables
     |> window(every: every, period: period)
     |> mean(column: column)
     |> duplicate(column: "_stop", as: "_time")
     |> window(every: inf)
->>>>>>> master
 ```
 
 #### Table transformation with a two point moving average