Merge branch 'devel-2.5'
authorMichael Hanselmann <hansmi@google.com>
Fri, 26 Aug 2011 14:32:01 +0000 (16:32 +0200)
committerMichael Hanselmann <hansmi@google.com>
Fri, 26 Aug 2011 14:33:32 +0000 (16:33 +0200)
commitfe00ccef01461b34e7b1729b0ebd1c3e7572242e
treedc5dca6fde4ea1dbc2e267473ca7717554aa1eeb
parentc4708267e9ee2f14f10b95c714c3f51192aa05a4
parentb972c2237ee53480fa8bb8be0b8ff146a1b1dfdc
Merge branch 'devel-2.5'

* devel-2.5:
  Delete master IPs from mergee master nodes
  Use pep8 utility in “make lint”
  Two more PEP8 fixes
  check-python-code: Give location(s) of lines longer than 80 chars

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
lib/cmdlib.py