projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0d39c8 1d4930b)
Merge branch 'stable-2.5' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Thu, 24 Nov 2011 12:15:46 +0000 (13:15 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 24 Nov 2011 12:22:09 +0000 (13:22 +0100)
* stable-2.5:
  ConfigWriter: Fix epydoc error

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Andrea Spadaccini <spadaccio@google.com>

1  2 
lib/config.py patch | diff1 | diff2 | blob | history

diff --cc lib/config.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.