Merge remote branch 'origin/devel-2.1'

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e48f1a6..1734d25 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,6 +148,8 @@ docrst = \
        doc/admin.rst \
        doc/design-2.0.rst \
        doc/design-2.1.rst \
+       doc/design-2.2.rst \
+       doc/design-cluster-merger.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -330,6 +332,7 @@ python_tests = \
        test/ganeti.hooks_unittest.py \
        test/ganeti.http_unittest.py \
        test/ganeti.locking_unittest.py \
+       test/ganeti.luxi_unittest.py \
        test/ganeti.mcpu_unittest.py \
        test/ganeti.objects_unittest.py \
        test/ganeti.opcodes_unittest.py \