diff options
author | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 16:59:00 +0000 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 16:59:00 +0000 |
commit | 92eaa72ea4cd0d06c2161842c548008db0eee01c (patch) | |
tree | 441658ad7f69a2a3deb404e43a7ff8e2d50e101a /xlators/features/changelog/lib/src/gf-changelog-helpers.h | |
parent | e0cce4cf7c22d5cd8ab6c2aff4ecf28c18c6a469 (diff) |
Temporarily revert NSR-specific changelog patches.
This is necessary so that patches from upstream can merge cleanly.
Otherwise there are some nasty conflicts, and resolving them by
hand gets even uglier than this approach.
Change-Id: I4235f8ba0ad63563c2e7dec1a1e8eeb636657574
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/features/changelog/lib/src/gf-changelog-helpers.h')
-rw-r--r-- | xlators/features/changelog/lib/src/gf-changelog-helpers.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xlators/features/changelog/lib/src/gf-changelog-helpers.h b/xlators/features/changelog/lib/src/gf-changelog-helpers.h index f35220ccb..3aa6ed7b8 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-helpers.h +++ b/xlators/features/changelog/lib/src/gf-changelog-helpers.h @@ -94,5 +94,4 @@ gf_ftruncate (int fd, off_t length); off_t gf_lseek (int fd, off_t offset, int whence); - #endif |