From 6fff7d0f38b71f50f4fd91376c2946d1ebfb9d76 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@google.com>
Date: Wed, 11 Mar 2015 12:20:51 -0700
Subject: [PATCH] Update changelog for v1.2.2

Change-Id: I0e162ac2d0b9d96a32c5c1b8314753e57fe2481a
---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15c15457bd..b3bea8f650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.2.2 (2015-03-11)
+
+Bugfixes:
+  - Version 1.2.1 had multiple issues with its version numbering.  These
+    are now corrected, but npm requires unique version numbers to publish.
+    Version 1.2.1 has been pulled from npm.
+    - https://github.com/google/shaka-player/issues/30
+
+Features:
+  - Added getAdaptationEnabled() to Player.
+    - https://github.com/google/shaka-player/issues/29
+
+
 ## 1.2.1 (2015-03-10)
 
 A roll-up of recent bugfixes, plus a few minor additions to the test app.