Version 2.1.0-dev.6.0
Merge commit 'c23a9815ec071ece905740801fd1499bcab27729' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c65b1c..b6949d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,21 @@
-## 2.1.0-dev.XX.0
-(Add new changes here, and they will be copied to the change section for the
- next dev version)
+## 2.1.0-dev.6.0
-### Language
+## 2.1.0-dev.5.0
-### Dart VM
+### Core library changes
-### Tool Changes
+#### `dart:core`
-#### Pub
+* Exported `Future` and `Stream` from `dart:core`.
+* Added operators `&`, `|` and `^` to `bool`.
-#### Other Tools
+#### `dart:async`
+
+* Fix a bug where calling `stream.take(0).drain(value)` would not correctly
+ forward the `value` through the returned `Future`.
+* Add a `StreamTransformer.fromBind` constructor.
+
+## 2.1.0-dev.4.0
### Core library changes
@@ -19,17 +24,15 @@
* Added missing methods to `UnmodifiableMapMixin`. Some maps intended to
be unmodifiable incorrectly allowed new methods added in Dart 2 to
succeed.
-* Exported `Future` and `Stream` from `dart:core`.
-* Added operators `&`, `|` and `^` to `bool`.
-#### `dart:async`
+## 2.1.0-dev.3.1
-* Fix a bug where calling `stream.take(0).drain(value)` would not correctly
- forward the `value` through the returned `Future`.
+### Tool Changes
-#### `dart:async`
+#### dartanalyzer
-* Add a `StreamTransformer.fromBind` constructor.
+* Fix a bug in analyzer by cherry-picking commit
+ bd9645abad40d14c8cd9197dfb5c9cc45b20e9d6
## 2.1.0-dev.3.0
diff --git a/tools/VERSION b/tools/VERSION
index 3408fb4..646d82b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -23,9 +23,9 @@
# * Making cherry-picks to stable channel
# - increase PATCH by 1
#
-CHANNEL be
+CHANNEL dev
MAJOR 2
MINOR 1
PATCH 0
-PRERELEASE 0
+PRERELEASE 6
PRERELEASE_PATCH 0
