projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a28f59 288d9e0)
Merge branch 'devel-2.1'
authorMichael Hanselmann <hansmi@google.com>
Thu, 18 Feb 2010 12:40:51 +0000 (13:40 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 18 Feb 2010 12:40:51 +0000 (13:40 +0100)
commit69ca2f0bfbf7945b0497be32ca615361ea6359e5
tree7a06081e98deaef999facf7308392c93b25293b8tree | snapshot
parent8a28f5913a147a89fed67c75ad301bc109b0ac61commit | diff
parent288d9e0154407e32f38e86fdd8d3c24754452a99commit | diff
Merge branch 'devel-2.1'

* devel-2.1:
  Reset tempfile module after fork where useful
  Move RunInSeparateProcess to ganeti.utils
  Add function to reset tempfile module after fork
  Fix ssh host key checking with no-key-check
  Simplify a bit _GetWantedNodes
  Fix a wrong docstring
  ganeti-noded: Fix bug when export didn't succeed for all disks
  Remove boiler-plate code about node/instance names

Conflicts:
lib/cmdlib.py: Trivial
Makefile.am diff1 | diff2 | blob | history
daemons/ganeti-masterd diff1 | diff2 | blob | history
daemons/ganeti-noded diff1 | diff2 | blob | history
lib/cmdlib.py diff1 | diff2 | blob | history
lib/http/server.py diff1 | diff2 | blob | history
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.