Merge branch 'upstream'HEADmaster

Conflicts:
	rpc/xdr/src/glusterfs3-xdr.c
	rpc/xdr/src/glusterfs3-xdr.h
	xlators/features/changelog/src/Makefile.am
	xlators/features/changelog/src/changelog-helpers.h
	xlators/features/changelog/src/changelog.c
	xlators/mgmt/glusterd/src/glusterd-sm.c

Change-Id: I9972a5e6184503477eb77a8b56c50a4db4eec3e2

1 files changed, 0 insertions, 95 deletions

diff --git a/rpc/xdr/src/nsm-xdr.h b/rpc/xdr/src/nsm-xdr.h
deleted file mode 100644
index 9de642c15..000000000
--- a/rpc/xdr/src/nsm-xdr.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NSM_H_RPCGEN
-#define _NSM_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SM_MAXSTRLEN 1024
-
-struct sm_name {
-	char *mon_name;
-};
-typedef struct sm_name sm_name;
-
-enum res {
-	STAT_SUCC = 0,
-	STAT_FAIL = 1,
-};
-typedef enum res res;
-
-struct sm_stat_res {
-	res res_stat;
-	int state;
-};
-typedef struct sm_stat_res sm_stat_res;
-
-struct sm_stat {
-	int state;
-};
-typedef struct sm_stat sm_stat;
-
-struct my_id {
-	char *my_name;
-	int my_prog;
-	int my_vers;
-	int my_proc;
-};
-typedef struct my_id my_id;
-
-struct mon_id {
-	char *mon_name;
-	struct my_id my_id;
-};
-typedef struct mon_id mon_id;
-
-struct mon {
-	struct mon_id mon_id;
-	char priv[16];
-};
-typedef struct mon mon;
-
-struct nsm_callback_status {
-	char *mon_name;
-	int state;
-	char priv[16];
-};
-typedef struct nsm_callback_status nsm_callback_status;
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_sm_name (XDR *, sm_name*);
-extern  bool_t xdr_res (XDR *, res*);
-extern  bool_t xdr_sm_stat_res (XDR *, sm_stat_res*);
-extern  bool_t xdr_sm_stat (XDR *, sm_stat*);
-extern  bool_t xdr_my_id (XDR *, my_id*);
-extern  bool_t xdr_mon_id (XDR *, mon_id*);
-extern  bool_t xdr_mon (XDR *, mon*);
-extern  bool_t xdr_nsm_callback_status (XDR *, nsm_callback_status*);
-
-#else /* K&R C */
-extern bool_t xdr_sm_name ();
-extern bool_t xdr_res ();
-extern bool_t xdr_sm_stat_res ();
-extern bool_t xdr_sm_stat ();
-extern bool_t xdr_my_id ();
-extern bool_t xdr_mon_id ();
-extern bool_t xdr_mon ();
-extern bool_t xdr_nsm_callback_status ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NSM_H_RPCGEN */