projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e03959 2596526)
Merge branch 'devel-2.2' into devel-2.3
authorIustin Pop <iustin@google.com>
Fri, 19 Nov 2010 13:01:14 +0000 (14:01 +0100)
committerIustin Pop <iustin@google.com>
Fri, 19 Nov 2010 13:06:42 +0000 (14:06 +0100)
commit2b613de4d5e769ee257b4743ae1595ab9fb53ee3
tree13219659d31c25529212adcac4a2845310dd9c08tree | snapshot
parent3e039592aa0425500d00fefe7be420610f9f5919commit | diff
parent2596526d9b9c251c4ae3e36b0608761bddfbe58fcommit | diff
Merge branch 'devel-2.2' into devel-2.3

* devel-2.2:
  Update NEWS & configure.ac for the 2.2.2 release
  Fix documentation regarding conversion to drbd

Conflicts:
NEWS         (integrated 2.2 changes)
configure.ac (kept our version)

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