projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 921efbb 39292d3)
Merge branch 'devel-2.1'
authorMichael Hanselmann <hansmi@google.com>
Wed, 7 Apr 2010 15:36:57 +0000 (17:36 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 7 Apr 2010 15:47:14 +0000 (17:47 +0200)
commitcf6fee174740c3d88186db688ec556f4f08307fe
tree735e6a21097b47463f63285b22c43f72c52d7657tree | snapshot
parent921efbb30c58a05f7f3e1933a79b95b5d939e649commit | diff
parent39292d3a9802ebba9ee787ca27b3301a29c07b46commit | diff
Merge branch 'devel-2.1'

* devel-2.1:
  Fix consistency checks in ConfdFilterCallback
  Fix utils.WaitForFdCondition inner retry loop
  Fix bug introduced in 76e5f8b54: mkdir mode
  utils: Move wrapper code around os.makedirs into separate function
  Fix unittest for the rapi client library
  Adding RAPI client library.

Conflicts:
test/ganeti.utils_unittest.py: Trivial

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Makefile.am diff1 | diff2 | blob | history
lib/daemon.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.