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/src/changelog-misc.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/src/changelog-misc.h')
| -rw-r--r-- | xlators/features/changelog/src/changelog-misc.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xlators/features/changelog/src/changelog-misc.h b/xlators/features/changelog/src/changelog-misc.h index 58bd3279d..127b03e2e 100644 --- a/xlators/features/changelog/src/changelog-misc.h +++ b/xlators/features/changelog/src/changelog-misc.h @@ -18,7 +18,7 @@ #define CHANGELOG_FILE_NAME "CHANGELOG" #define CHANGELOG_VERSION_MAJOR 1 -#define CHANGELOG_VERSION_MINOR 0 +#define CHANGELOG_VERSION_MINOR 1 #define CHANGELOG_UNIX_SOCK DEFAULT_VAR_RUN_DIRECTORY"/changelog-%s.sock" @@ -65,7 +65,7 @@ } while (0) /** - * everything after @CHANGELOG_TYPE_ENTRY are internal types + * everything after 'CHANGELOG_TYPE_ENTRY' are internal types * (ie. none of the fops trigger this type of event), hence * CHANGELOG_MAX_TYPE = 3 */ @@ -91,12 +91,6 @@ typedef enum { CHANGELOG_ENCODE_MAX, } changelog_encoder_t; -/* logging policies */ -typedef enum { - CHANGELOG_LOG_POLICY_DEFAULT = 0, - CHANGELOG_LOG_POLICY_REPLICATE, -} changelog_log_policy_t; - #define CHANGELOG_VALID_ENCODING(enc) \ (enc > CHANGELOG_ENCODE_MIN && enc < CHANGELOG_ENCODE_MAX) |