Merge branch 'kvm-cluster' slapos-0.267
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Wed, 6 May 2015 09:09:01 +0000 (11:09 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Wed, 6 May 2015 09:09:01 +0000 (11:09 +0200)
commit21f1d1bceea697b3e59a5605924bc9f041922201
tree0497927205307d1abd398a80c73d1c2992b9356a
parent0985712a373cb6f1f7d353d4aaf6451f208ac748
parent34657ed640ec1520023bff7ae41f3bd0f173de0e
Merge branch 'kvm-cluster'