glusterfs-nsr.git/libglusterfs/src, branch master

Merge branch 'upstream'

2014-04-28T14:18:50+00:00

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

libglusterfs: Define macro GF_PRI_USEC for Linux as well

2014-04-27T06:02:03+00:00

Change-Id: I073f1f4ead4391d497fbb7603f9ee0257271493b
BUG: 1089172
Signed-off-by: Pranith Kumar K 
Reviewed-on: http://review.gluster.org/7571
Reviewed-by: Harshavardhana 
Tested-by: Harshavardhana 
Reviewed-by: Anand Avati

build: MacOSX Porting fixes

2014-04-24T21:41:48+00:00

git@forge.gluster.org:~schafdog/glusterfs-core/osx-glusterfs

Working functionality on MacOSX

 - GlusterD (management daemon)
 - GlusterCLI (management cli)
 - GlusterFS FUSE (using OSXFUSE)
 - GlusterNFS (without NLM - issues with rpc.statd)

Change-Id: I20193d3f8904388e47344e523b3787dbeab044ac
BUG: 1089172
Signed-off-by: Harshavardhana 
Signed-off-by: Dennis Schafroth 
Tested-by: Harshavardhana 
Tested-by: Dennis Schafroth 
Reviewed-on: http://review.gluster.org/7503
Tested-by: Gluster Build System 
Reviewed-by: Anand Avati

gNFS: Support wildcard in RPC auth allow/reject

2014-04-23T06:40:26+00:00

RFE: Support wildcard in "nfs.rpc-auth-allow" and
"nfs.rpc-auth-reject". e.g.
  *.redhat.com
  192.168.1[1-5].*
  192.168.1[1-5].*, *.redhat.com, 192.168.21.9

  Along with wildcard, support for subnetwork or IP range e.g.
  192.168.10.23/24

The option will be validated for following categories:
1) Anonymous i.e. "*"
2) Wildcard pattern i.e. string containing any ('*', '?', '[')
3) IPv4 address
4) IPv6 address
5) FQDN
6) subnetwork or IPv4 range

Currently this does not support IPv6 subnetwork.

Change-Id: Iac8caf5e490c8174d61111dad47fd547d4f67bf4
BUG: 1086097
Signed-off-by: Santosh Kumar Pradhan 
Reviewed-on: http://review.gluster.org/7485
Reviewed-by: Poornima G 
Reviewed-by: Harshavardhana 
Tested-by: Gluster Build System 
Reviewed-by: Vijay Bellur

Merge branch 'upstream'

2014-04-22T15:37:09+00:00

Conflicts:
	glusterfs.spec.in
	xlators/mgmt/glusterd/src/Makefile.am
	xlators/mgmt/glusterd/src/glusterd-utils.c
	xlators/mgmt/glusterd/src/glusterd.h

Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d

strfd: memory backed file descriptor

2014-04-21T16:30:46+00:00

A file descriptor like interface, backed by a string, on which
fprintf() like IO can be performed. Internally the backing string
is grown on demand.

Useful in generating virtual file content on the fly (used in meta)

Change-Id: I60d8751c4c750f3f06aa454a4ccd9909b3ac8ac7
BUG: 1089216
Signed-off-by: Anand Avati 
Reviewed-on: http://review.gluster.org/7508
Reviewed-by: Pranith Kumar Karampuri 
Tested-by: Gluster Build System

common-utils: new dirent compatible time fmt

2014-04-21T01:07:44+00:00

Introduce a new time format without "/" and spaces, in order to
be used in (virtual) filenames.

Change-Id: I468be54f1ec7f45265add4c458e19d95567439f7
BUG: 1089216
Signed-off-by: Anand Avati 
Reviewed-on: http://review.gluster.org/7507
Tested-by: Gluster Build System 
Reviewed-by: Pranith Kumar Karampuri

defaults: add new symbol default_fops

2014-04-21T01:06:57+00:00

with members filled with pointers to appropriate default methods

Change-Id: I6cdc43e4f6776e2ad45cd5cbca5642e0c639ffde
BUG: 1089216
Signed-off-by: Anand Avati 
Reviewed-on: http://review.gluster.org/7504
Tested-by: Gluster Build System 
Reviewed-by: Pranith Kumar Karampuri

dict: add dict_set_dynstr_with_alloc

2014-04-14T16:15:14+00:00

There is an overwhelming no. of instances of the following pattern in
glusterd module.

    ...

    char *dynstr = gf_strdup (str);
    if (!dynstr)
       goto err;
    ret = dict_set_dynstr (dict, key, dynstr);
    if (ret)
       goto err;

    ...

With this changes it would look as below,

   ret = dict_set_dynstr_with_alloc (dict, key, str);
   if (ret)
       goto err;

Change-Id: I6a47b1cbab4834badadc48c56d0b5c8c06c6dd4d
Signed-off-by: Krishnan Parthasarathi 
Reviewed-on: http://review.gluster.org/7379
Tested-by: Gluster Build System 
Reviewed-by: Jeff Darcy

logging: Make logger and log format configurable through cli

2014-04-12T01:00:54+00:00

Change-Id: Ic4b701a6621578848ff67ae4ecb5a10b5f32f93b
BUG: 1075611
Signed-off-by: Krutika Dhananjay 
Reviewed-on: http://review.gluster.org/7372
Tested-by: Gluster Build System 
Reviewed-by: Krishnan Parthasarathi 
Reviewed-by: Vijay Bellur