From 1890e5e09203e65b1c64f0f13c213d8944b81b87 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Wed, 27 Apr 2016 11:41:05 +0000 Subject: Swap order of GF_EVENT_SOME_CHILD_DOWN enum GF_EVENT_SOME_CHILD_DOWN value seems to be mismatching between master and 3.7. Fix the master since 3.7 is a release branch and GF_EVENT_SOME_CHILD_DOWN was added newly and hence should be in the end in the enum list. Signed-off-by: Ravishankar N Change-Id: I1f758550d6300f6750d1574302096d8e7f493549 BUG: 1330974 Reviewed-on: http://review.gluster.org/14092 Tested-by: Ravishankar N Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: N Balachandran CentOS-regression: Gluster Build System --- libglusterfs/src/glusterfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index d3be103d074..5bdb5801fcf 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -658,8 +658,8 @@ typedef enum { GF_EVENT_PARENT_DOWN, GF_EVENT_VOLUME_BARRIER_OP, GF_EVENT_UPCALL, - GF_EVENT_SOME_CHILD_DOWN, GF_EVENT_SCRUB_STATUS, + GF_EVENT_SOME_CHILD_DOWN, GF_EVENT_MAXVAL, } glusterfs_event_t; -- cgit