commit 3eb911ac9ebc5ee9641d6989d4da4ab75833bb67
Merge: 612ddcd 47f95a9
Author: Petr Pudlak <[email protected]>
Date: Tue Mar 17 18:56:33 2015 +0100
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12
Annotate every send/receive operation in Exec.hs
Refactor `rethrowAnnotateIOError` and simplify its usage
Query.Exec: Describe error if talking to job process fails
Query.Exec: Log error when talking to job process fails
Conflicts:
src/Ganeti/Query/Exec.hs
Resolution: keep 2.12 version, which is an enhancement of patches
cherry-picked from 2.13
