projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2650ea6 3695a4e)
Merge branch 'stable-2.8' into stable-2.9
authorKlaus Aehlig <aehlig@google.com>
Wed, 17 Jul 2013 15:09:34 +0000 (17:09 +0200)
committerKlaus Aehlig <aehlig@google.com>
Wed, 17 Jul 2013 16:55:44 +0000 (18:55 +0200)
commit489c903778007ddb024b688431bb48cbcad9981d
treeb1d24684ceb97135a8eded0f9f6bddcb8ccf77e3tree | snapshot
parent2650ea6bc7b3fe1f8f107a9f291f3fc0846d3bd0commit | diff
parent3695a4e0ec7185155328aa485267e859ef5e6352commit | diff
Merge branch 'stable-2.8' into stable-2.9

* stable-2.8
  Rename queryd to luxid
  Document the rapi client not to have a QueryNetworks method
  Enable unit tests again
  Document ganeti-queryd
  Add ganeti-queryd to QA env test
  Add queryd daemon (split from confd)
  Extract ConfigReader from Confd/Server.hs
  Add timestamps to haskell network query fields

Conflicts:
src/Ganeti/Confd/Server.hs (trivial)

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
.gitignore diff1 | diff2 | blob | history
INSTALL diff1 | diff2 | blob | history
Makefile.am diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
lib/constants.py diff1 | diff2 | blob | history
src/Ganeti/Confd/Server.hs diff1 | diff2 | blob | history
src/Ganeti/Daemon.hs diff1 | diff2 | blob | history
src/Ganeti/Query/Server.hs diff1 | diff2 | blob | history
tools/vcluster-setup.in diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.