Version 2.1.1-dev.1.0
Merge commit '2cb346bd0cce075a5b7988cedb678e822a1d50f4' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd8d5e4..165e23f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,4 @@
-## 2.2.0-dev.XX.0
-(Add new changes here, and they will be copied to the change section for the
- next dev version)
-
-### Language
-
-### Core library changes
-
-### Dart VM
+## 2.1.1-dev.1.0
### Tool Changes
@@ -89,8 +81,6 @@
* dartdoc default styles now work much better on mobile. Simple browsing
and searching of API docs now work in many cases.
-#### Pub
-
#### Linter
The linter was bumped to `0.1.78` which introduces the following linter fixes to the SDK:
@@ -109,7 +99,31 @@
* a new `prefer_final_in_for_each` lint rule to flag loop variables that could be declared final
-#### Other Tools
+## 2.1.1-dev.0.1
+
+* Cherry-pick 4914fe57ea9e034b948ef3ab5a4e7e511991f845 to dev
+* Cherry-pick 5a8ec419829337b60d705cabe0b3b1ab5d0d0883 to dev
+
+## 2.1.1-dev.0.0
+
+* Cherry-pick f8a680e5116493f8795c148a52dbecf8a84e4536 to dev
+* Cherry-pick b1c963c84b20e715bc5c1f7d443168071c2b971d to dev
+
+## 2.2.0-dev.1.1
+
+### Tool Changes
+
+#### Linter
+
+The linter was bumped to `0.1.73` which introduces the following new lints to the SDK:
+
+* `unnecessary_await_in_return`
+* `use_function_type_syntax_for_parameters`
+* `avoid_returning_null_for_future`
+* `avoid_shadowing_type_parameters`
+
+In addition, `prefer_bool_in_asserts` has been deprecated as its semantics are
+redundant with Dart 2 checks.
## 2.2.0-dev.0.0
diff --git a/tools/VERSION b/tools/VERSION
index 7579d0d..604b271 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 2
-PATCH 0
-PRERELEASE 0
+MINOR 1
+PATCH 1
+PRERELEASE 1
PRERELEASE_PATCH 0
