Merge branch 'devel-2.1'
authorBalazs Lecz <leczb@google.com>
Tue, 20 Apr 2010 16:21:12 +0000 (17:21 +0100)
committerBalazs Lecz <leczb@google.com>
Tue, 20 Apr 2010 16:26:41 +0000 (17:26 +0100)
commitf39cd91ddfb6ff918248b613d1e899792988600f
tree5148681fd5da904f2e9349e8c6417a52e96a104b
parent1651d116f5596638959a148d5d0f00d2ff750939
parent4e9dcb8afc7153e85b36ec2d8b25a840a1d4e683
Merge branch 'devel-2.1'

Conflicts:
doc/security.rst
  trivial
lib/cli.py
  trivial

Signed-off-by: Balazs Lecz <leczb@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
12 files changed:
Makefile.am
doc/security.rst
lib/backend.py
lib/bootstrap.py
lib/cli.py
lib/cmdlib.py
lib/constants.py
lib/objects.py
lib/opcodes.py
lib/rapi/rlib2.py
man/gnt-cluster.sgml
scripts/gnt-cluster