Merge with default.

--HG--
branch : metaclass_undefined

1 files changed, 39 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 92faa5441..35e475349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,11 +2,50 @@ ChangeLog for Pylint
 ====================
 
 --
+
     * Emit 'undefined-variable' for undefined names when using the
       Python 3 `metaclass=` argument.
 
+    * Checkers respect priority now. Close issue #229.
+    
+    * Fix a false positive regarding W0511. Closes issue #149.
+
     * Fix unused-import false positive with Python 3 metaclasses (#143).
 
+    * Don't warn with 'bad-format-character' when encountering
+      the 'a' format on Python 3.
+
+    * Add multiple checks for PEP 3101 advanced string formatting:
+     'bad-format-string', 'missing-format-argument-key',
+     'unused-format-string-argument', 'format-combined-specification',
+     'missing-format-attribute' and 'invalid-format-index'.
+
+    * Issue broad-except and bare-except even if the number
+      of except handlers is different than 1. Fixes issue #113.
+
+    * Issue attribute-defined-outside-init for all cases, not just
+      for the last assignment. Closes issue #262.
+
+    * Emit 'not-callable' when calling properties. Closes issue #268.
+
+    * Fix a false positive with unbalanced iterable unpacking,
+      when encountering starred nodes. Closes issue #273.
+
+    * Add new checks, 'invalid-slice-index' and 'invalid-sequence-index'
+      for invalid sequence and slice indices.
+
+    * Add 'assigning-non-slot' warning, which detects assignments to
+      attributes not defined in slots.
+
+    * Don't emit 'no-name-in-module' for ignored modules.
+      Closes issue #223.
+
+    * Fix an 'unused-variable' false positive, where the variable is
+      assigned through an import. Closes issue #196.
+
+    * Definition order is considered for classes, function arguments
+      and annotations. Closes issue #257.
+
 2014-04-30  --  1.2.1
     * Restore the ability to specify the init-hook option via the
       configuration file, which was accidentally broken in 1.2.0.