projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f0ca30 eeeed36)
Merge branch 'stable-2.9' into stable-2.10
authorKlaus Aehlig <aehlig@google.com>
Tue, 25 Feb 2014 15:20:33 +0000 (16:20 +0100)
committerKlaus Aehlig <aehlig@google.com>
Tue, 25 Feb 2014 15:25:40 +0000 (16:25 +0100)
commit7253aaf28dad28572b2c1143088cc4a9f80a3226
tree72073f51bca089797c57bb2146d65590d402f316tree | snapshot
parent0f0ca3065b930878857214dab01adec03ddb2bfdcommit | diff
parenteeeed3652d08ae5f97d70f5e9764efb9f7d77604commit | diff
Merge branch 'stable-2.9' into stable-2.10

* stable-2.9
  Revision bump for 2.9.5
  Set release date for 2.9.5
  Add NEWS entry for 2.9.5

Conflicts:
NEWS: take both additions
configure.ac: ignore revision bump

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
NEWS diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.