Merge branch 'kvm-cluster'
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Thu, 23 Jul 2015 14:31:06 +0000 (16:31 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Thu, 23 Jul 2015 14:31:06 +0000 (16:31 +0200)
commitef18cc42a5992609160306978c2ee643e983a4bc
tree400533f7359276f3ca4ce5c5b2379422ab368dcb
parente244ebb0fcc9da68b260ebf3b7013740de3f0b66
parent8d221be76743f55c7bc62b3304e0477b54c5399c
Merge branch 'kvm-cluster'

Conflicts:
software/kvm/common.cfg
software/wendelin/software.cfg