Merge branch 'devel-2.7'

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5831bb9..fc3a522 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -401,6 +401,7 @@ docinput = \
        doc/design-monitoring-agent.rst \
        doc/design-virtual-clusters.rst \
        doc/design-x509-ca.rst \
+       doc/design-hroller.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -437,7 +438,7 @@ HS_COMPILE_PROGS= \
 # All Haskell non-test programs to be compiled but not automatically installed
 HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS)
 
-HS_BIN_ROLES = hbal hscan hspace hinfo hcheck hroller
+HS_BIN_ROLES = harep hbal hscan hspace hinfo hcheck hroller
 HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
 
 HS_ALL_PROGS = \
@@ -506,6 +507,7 @@ HS_LIB_SRCS = \
        src/Ganeti/HTools/Node.hs \
        src/Ganeti/HTools/PeerMap.hs \
        src/Ganeti/HTools/Program/Hail.hs \
+       src/Ganeti/HTools/Program/Harep.hs \
        src/Ganeti/HTools/Program/Hbal.hs \
        src/Ganeti/HTools/Program/Hcheck.hs \
        src/Ganeti/HTools/Program/Hinfo.hs \
@@ -530,6 +532,7 @@ HS_LIB_SRCS = \
        src/Ganeti/Query/Group.hs \
        src/Ganeti/Query/Job.hs \
        src/Ganeti/Query/Language.hs \
+       src/Ganeti/Query/Network.hs \
        src/Ganeti/Query/Node.hs \
        src/Ganeti/Query/Query.hs \
        src/Ganeti/Query/Server.hs \
@@ -1046,12 +1049,16 @@ TEST_FILES = \
        test/data/proc_drbd83_sync.txt \
        test/data/proc_drbd83_sync_want.txt \
        test/data/proc_drbd83_sync_krnl2.6.39.txt \
+       test/data/qa-minimal-nodes-instances-only.json \
        test/data/sys_drbd_usermode_helper.txt \
        test/data/vgreduce-removemissing-2.02.02.txt \
        test/data/vgreduce-removemissing-2.02.66-fail.txt \
        test/data/vgreduce-removemissing-2.02.66-ok.txt \
        test/data/vgs-missing-pvs-2.02.02.txt \
        test/data/vgs-missing-pvs-2.02.66.txt \
+       test/data/xen-xm-info-4.0.1.txt \
+       test/data/xen-xm-list-4.0.1-dom0-only.txt \
+       test/data/xen-xm-list-4.0.1-four-instances.txt \
        test/py/ganeti-cli.test \
        test/py/gnt-cli.test \
        test/py/import-export_unittest-helper