diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 5 | ||||
| -rwxr-xr-x | rfc.sh | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7bfee047a..d76c018ef 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl General Public License, version 3 or any later version (LGPLv3 or dnl later), or the GNU General Public License, version 2 (GPLv2), in all dnl cases as published by the Free Software Foundation. -AC_INIT([glusterfs],[3git],[gluster-users@gluster.org],,[https://github.com/gluster/glusterfs.git]) +AC_INIT([glusterfs],[3.5git],[gluster-users@gluster.org],,[https://github.com/gluster/glusterfs.git]) AM_INIT_AUTOMAKE diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index bbfc50593..0484779ce 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -1456,7 +1456,12 @@ glusterfs_volfile_fetch (glusterfs_ctx_t *ctx) ret = mgmt_submit_request (&req, frame, ctx, &clnt_handshake_prog, GF_HNDSK_GETSPEC, mgmt_getspec_cbk, (xdrproc_t)xdr_gf_getspec_req); + out: + GF_FREE (req.xdata.xdata_val); + if (dict) + dict_unref (dict); + return ret; } @@ -1,7 +1,7 @@ #!/bin/sh -e -branch="master"; +branch="release-3.5"; set_hooks_commit_msg() |