diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-02-06 18:00:14 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-02-06 18:00:14 +0100 |
| commit | 8333c0dff14a8a16c8ad3a95c6ea09f9d6f395b3 (patch) | |
| tree | 76aa97eea763dd725edada2b3d210f27b8f7af5a /block/gluster.c | |
| parent | 8c44dfbc62a50a8bc4113f199b8662861f757591 (diff) | |
| parent | b1ca639184d93984551b423d8e538ad4add5eb15 (diff) | |
Merge remote-tracking branch 'mreitz/block' into queue-block
* mreitz/block:
block: Eliminate silly QERR_ macros used for encryption keys
block: New bdrv_add_key(), convert monitor to use it
blockdev: Eliminate silly QERR_BLOCK_JOB_NOT_ACTIVE macro
blockdev: Give find_block_job() an Error ** parameter
Diffstat (limited to 'block/gluster.c')
0 files changed, 0 insertions, 0 deletions