projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 708f830 a50b49b)
Merge branch 'stable-2.9' into stable-2.10
authorKlaus Aehlig <aehlig@google.com>
Wed, 30 Oct 2013 13:07:52 +0000 (14:07 +0100)
committerKlaus Aehlig <aehlig@google.com>
Wed, 30 Oct 2013 13:30:19 +0000 (14:30 +0100)
* stable-2.9
  (no changes)

* stable-2.8
  Add all dependencies for confd as test dependencies
  Add snap-server to the test-relevenat packages
  Placate warnings on ganeti.outils_unittest.py

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.