projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e26633 682f760)
Merge branch 'devel-2.1'
authorGuido Trotter <ultrotter@google.com>
Wed, 12 May 2010 11:22:47 +0000 (12:22 +0100)
committerGuido Trotter <ultrotter@google.com>
Wed, 12 May 2010 11:40:27 +0000 (12:40 +0100)
commit40523663e19146a3d72ffed6998055c10a8c0c08
tree3d64074079caf9a705ad80ae1ba2105a546ec53etree | snapshot
parent5e26633b2fdcfabfa25222e28ec61bcf8083d0b9commit | diff
parent682f7601150fe6079d804427c3e8f87e333efa38commit | diff
Merge branch 'devel-2.1'

* devel-2.1:
  Convert some ReadFile calls to ReadOneLineFile
  utils.ReadOneLineFile()
  Remove oneline= parameter from utils.ReadFile
  install.rst: update os version and add KVM notes
  INSTALL: update hypervisor requirements
  RAPI client: Fix SSL error reporting for real

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
lib/utils.py diff1 | diff2 | blob | history
test/ganeti.utils_unittest.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.