diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-04 14:42:40 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-04 14:42:40 +0000 |
| commit | 0de07f4189cbd191a765c60ed3d7c72f72112e68 (patch) | |
| tree | 83781a0df06c9110c6f3db12caad23ea00832b53 /error-codes.json | |
| parent | c28972ea53cc7cdb91c7aac01754dd7f0b66e1a7 (diff) | |
| parent | 9f45d0f6212d6d5c96dafc4aba73d9d12b39c3d6 (diff) | |
Merge branch 'upstream' into merge
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Conflicts:
api/src/glfs-fops.c
libglusterfs/src/syncop.c
libglusterfs/src/syncop.h
Change-Id: I8c3fa7a20fb167d9e6bc2749e177c0c8b366827b
Diffstat (limited to 'error-codes.json')
0 files changed, 0 insertions, 0 deletions