From c8a6ecddb862a29c133e1f4a51ecbfe407c6c897 Mon Sep 17 00:00:00 2001
From: Max Linke <max_linke@gmx.de>
Date: Thu, 29 Dec 2016 11:12:11 +0100
Subject: [PATCH] update CHANGELOG

---
 package/CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/CHANGELOG b/package/CHANGELOG
index 87818571bab..dab79d5cd59 100644
--- a/package/CHANGELOG
+++ b/package/CHANGELOG
@@ -112,6 +112,11 @@ Changes
     raising TypeError and filename is now a required arg instead of kwarg
   * moved coordinates.base.ChainReader to coordinates.chain.ChainReader
   * renamed private method ChainReader.get_flname() to ChainReader._get_filename()
+  * analysis.rms.RMSF now conforms to standard analysis API (PR #1136)
+  * analysis.rms/align function keyword `mass_weighted` is replaced
+  by generic `weights='mass'`. This new keyword allows to pass it an
+  arbitrary weights array as well. (PR 1136)
+
 
 Deprecations (Issue #599)
   * Use of rms_fit_trj deprecated in favor of AlignTraj class (Issue #845)