Merge branch 'resiliency_annotated' into lapp-resilient2
authorMarco Mariani <marco.mariani@nexedi.com>
Wed, 21 Nov 2012 13:43:18 +0000 (14:43 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Wed, 21 Nov 2012 13:43:18 +0000 (14:43 +0100)
commit9326f333b7e4045d5f9e2b90d57b8840a75b88c4
treebe51981549b7d09b6f132c240360e182247024fa
parenta3dc530ab26440de2395f866a1d3ac8549326ac2
parent719fb7366c3b7d68aed603fb80787bf11841b5d8
Merge branch 'resiliency_annotated' into lapp-resilient2