Merge branch 'devel-2.0' into devel-2.1
authorIustin Pop <iustin@google.com>
Mon, 28 Dec 2009 12:05:40 +0000 (13:05 +0100)
committerIustin Pop <iustin@google.com>
Mon, 28 Dec 2009 12:05:40 +0000 (13:05 +0100)
commitd984846ddf447c4eab67bd112cb5a52456f3fd3b
treef3692db0e7849f2724cd55ceba816d01f34ceeaa
parentfa05c92d588679b8dc1671997a373dd62f6a57d1
parent146afafbbda543d0991daac9d58b0f62a2a47164
Merge branch 'devel-2.0' into devel-2.1

* devel-2.0:
  Fix indentation in hv_kvm
  Implement BuildHooksEnv for NoHooksLU
  Clarifiy some more wide pylint disables
  Fix two bugs in seldom-used codepaths
  Update pylintrc
  Add targetted pylint disables
  Partial cherry-pick of 6c881c5 from the 2.1 branch
  Add a release script
  Fix a typo in the doc string

Conflicts:
lib/cli.py
lib/cmdlib.py
lib/hypervisor/hv_kvm.py
lib/jstore.py
lib/locking.py
lib/mcpu.py
lib/rapi/rlib2.py

Many of the conflicts were on code removed from 2.1, so the resolving was
trivial.
15 files changed:
lib/backend.py
lib/bdev.py
lib/cli.py
lib/cmdlib.py
lib/errors.py
lib/http/client.py
lib/hypervisor/hv_fake.py
lib/locking.py
lib/objects.py
lib/rapi/baserlib.py
lib/rapi/connector.py
lib/rapi/rlib2.py
lib/rpc.py
lib/serializer.py
pylintrc