Branch next Tag:V7-dev.1 Merge Highlights * set pnfs_ds pointer to NULL to avoid multiple repeated pnfs_ds_put that may cause a SIGSEGV error. * nfs4_op_open.c: retry_open_file open upgrade bad perms to fsal_reopen2 * Add HA ProxyProtocol config option * idmapper/idmapper.c: Removed a redundant call * Add register and deregister connection callbacks to the connection manager * Adding xattr support to FSAL_VFS * Recovery backend updates to support rados failover Signed-off-by: Frank S. Filz <ffilzlnx@mindspring.com> Contents: 66596c940 Frank S. Filz V7-dev.1 5402e6795 Xueqian Hu Support for Preserve_Unlinked 8526caa8e Sachin Punadikar Add failover functionality for rados_ng recovery 439cfc18f Sachin Punadikar SAL: Error handling for recovery backend init 1814cfd81 Shivam Singh [TEMPORARY] Code change for enabling takeover for rados_cluster module 7c726fbfb Shivam Singh Associated vip with rados recovery object in recovery_rados_ng 9df0a384d Fritz Elfert Adding xattr support to FSAL_VFS db4b9f9b2 Idan Eldar Add register and deregister connection callbacks to the connection manager 69da0b4ce Lior Suliman idmapper/idmapper.c: Removed a redundant call 293c1ae5e Idan Eldar Add HA ProxyProtocol config option 931ff3cc3 Jason Woodward nfs4_op_open.c: retry_open_file open upgrade bad perms to fsal_reopen2 59f735385 yinlei set pnfs_ds pointer to NULL to avoid multiple repeated pnfs_ds_put that may cause a SIGSEGV error.