projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8494604 1afea34)
Merge branch 'devel-2.1'
authorIustin Pop <iustin@google.com>
Tue, 22 Jun 2010 13:25:55 +0000 (15:25 +0200)
committerIustin Pop <iustin@google.com>
Tue, 22 Jun 2010 13:26:14 +0000 (15:26 +0200)
commit706c353c7e11f8e64ece4416529aa2636c04caa3
treecec7b0fde256ee85c701137374abe010c3a3721dtree | snapshot
parent8494604f49ac8dba5cb9f58291c5d005cf2a6657commit | diff
parent1afea34a8b45621e251a721045f2f89ce42f81f7commit | diff
Merge branch 'devel-2.1'

* devel-2.1:
  Add "adopt" to the allowed disk parameters
  Improve pylintrc for pylint 0.21+
  Fix warnings with Python 2.6
  Fix a small bug introduced in cf26a87a
  Fix the type of 'valid' attribute in LUDiagnoseOS

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
lib/cli.py diff1 | diff2 | blob | history
lib/cmdlib.py diff1 | diff2 | blob | history
scripts/gnt-job diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.