projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 982ed68 5d9f9cb)
Merge branch 'devel-2.3'
authorMichael Hanselmann <hansmi@google.com>
Wed, 1 Dec 2010 13:13:57 +0000 (14:13 +0100)
committerMichael Hanselmann <hansmi@google.com>
Wed, 1 Dec 2010 13:14:07 +0000 (14:14 +0100)
commitc033f259f07a5b86ae3abebce99ada092d68e57d
tree8dc4b9f316ce8242c41e1b42eb13fb77de4b1b91tree | snapshot
parent982ed68e1491867830ef4254abc758a3702cf82ccommit | diff
parent5d9f9cbadc397b9c908275e199d1d448f1eb11b6commit | diff
Merge branch 'devel-2.3'

* devel-2.3:
  Correct version check for release candidates
  config.py: need explicit %-formatting in errors.OpPrereqError.
  Fix version check
  Add script to check version format

Conflicts:
Makefile.am

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Makefile.am diff1 | diff2 | blob | history
lib/config.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.