projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29fbe62 fca7463)
Merge branch 'devel-2.6'
authorMichael Hanselmann <hansmi@google.com>
Thu, 18 Oct 2012 10:44:37 +0000 (12:44 +0200)
committerMichael Hanselmann <hansmi@google.com>
Thu, 18 Oct 2012 10:52:12 +0000 (12:52 +0200)
* devel-2.6:
  ensure-dirs: Don't accept arguments
  ensure-dirs: Fix program name on usage screen
  cli: Fix small typo

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

1  2 
lib/cli.py patch | diff1 | diff2 | blob | history
lib/tools/ensure_dirs.py patch | diff1 | diff2 | blob | history

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