From 92eaa72ea4cd0d06c2161842c548008db0eee01c Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Tue, 14 Jan 2014 16:59:00 +0000 Subject: 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 --- xlators/features/changelog/lib/src/gf-changelog-helpers.h | 1 - 1 file changed, 1 deletion(-) (limited to 'xlators/features/changelog/lib/src/gf-changelog-helpers.h') 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 -- cgit