From 2279a61c6fddab0a568a3e5bc1a22e4a6b3c880c Mon Sep 17 00:00:00 2001
From: allenbenz <allenbenz@users.noreply.github.com>
Date: Sat, 17 Mar 2018 20:04:17 -0700
Subject: [PATCH] Update the changelog to include 0.4.0 and unreleased changes.

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63927f50..f0e208df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,17 @@
 ### Unreleased
 
+* Bug fixes for race conditions.
+* Increased the default `rust.wait_to_build` time.
+
+### 0.4.0 - 2018-03-04
+
+* Added `rust.racer_completion` to allow disabling racer to work around a
+  [performance issue](https://github.com/rust-lang-nursery/rls/issues/688).
+* Spinner UI improvements.
+* Added a `cargo check` task.
+* The local active toolchain channel is now the default `rust-client.channel`.
 * Added `rust.jobs` to allow limiting the number of parallel Cargo jobs.
-* Workspace mode is now enabled by default.
+* Added support for workspaces.
 * Improved startup experience when using workspaces.
 * Deglob is now a code action instead of a command.
 * Warns and no longer crashes RLS if a single file is opened instead of a