diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-01-21 13:49:08 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-01-21 13:49:08 +0000 |
| commit | 6bcbf03b5aa4448832645a29ec2bc4b2fc5f2eaf (patch) | |
| tree | 750f73a40aa62c20d66a2532fef6fd158cebb9c4 /CONTRIBUTING | |
| parent | 0225d7bc712609232d592d48116ec771cd97c2cf (diff) | |
| parent | 17c4fb2d04f84b5632983866e8bddfbd7d77a054 (diff) | |
Merge branch 'upstream'
Conflicts:
api/src/glfs-fops.c
api/src/glfs-handleops.c
Change-Id: I6811674cc4ec4be6fa6e4cdebb4bc428194bebd8
Diffstat (limited to 'CONTRIBUTING')
0 files changed, 0 insertions, 0 deletions