460 files changed, 200954 insertions, 109144 deletions
diff --git a/xlators/Makefile.am b/xlators/Makefile.am
index 4c94f5e44..f60fa85ce 100644
--- a/xlators/Makefile.am
+++ b/xlators/Makefile.am
@@ -1,3 +1,4 @@
-SUBDIRS = cluster storage protocol performance debug features encryption mount nfs mgmt
+SUBDIRS = cluster storage protocol performance debug features encryption mount nfs mgmt system \
+          playground
 
 CLEANFILES =
diff --git a/xlators/bindings/python/src/Makefile.am b/xlators/bindings/python/src/Makefile.am
index c0b9141c6..90370d861 100644
--- a/xlators/bindings/python/src/Makefile.am
+++ b/xlators/bindings/python/src/Makefile.am
@@ -9,7 +9,7 @@ pythondir = $(xlatordir)/python
 
 python_so_SOURCES = python.c
 
-AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall \
+AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \
 	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \
 	$(PYTHON_CPPLAGS) -DGLUSTER_PYTHON_PATH=\"$(pythondir)\"
 
diff --git a/xlators/bindings/python/src/gluster.py b/xlators/bindings/python/src/gluster.py
index ee0eb1310..337c983ec 100644
--- a/xlators/bindings/python/src/gluster.py
+++ b/xlators/bindings/python/src/gluster.py
@@ -1,19 +1,12 @@
-#   Copyright (c) 2007 Chris AtLee <chris@atlee.ca>
-#   This file is part of GlusterFS.
-#
-#   GlusterFS is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published
	Commit message (Expand)	Author	Age	Files	Lines
*	libgfapi: adding 'follow' flag to glfs_h_lookupat()	Jiffin Tony Thottan	2015-08-24	1	-18/+18
*	gfapi : remove gfapi.py to avoid confusion	Humble Chirammal	2014-07-14	4	-451/+0
*	Revert "gfapi : remove gfapi.py to avoid confusion"	Vijay Bellur	2014-06-20	4	-0/+451
*	gfapi : remove gfapi.py to avoid confusion	Humble Chirammal	2014-06-20	4	-451/+0
*	Update references to the maillinglist to gluster-devel@gluster.org	Niels de Vos	2014-04-27	1	-1/+1
*	gfapi: glfs_set_volfile_server() now entertains multiple calls	Harshavardhana	2014-04-01	1	-2/+2
*	features/glupy: Rename Glupy python module to avoid namespace conflict	Justin Clift	2014-03-24	3	-6/+6
*	fixed a few misspellings. no code changes present	arvindch	2014-03-17	1	-4/+4
*	api: add glfs_get_volfile	Jeff Darcy	2014-03-05	1	-0/+43
*	libgfapi: fixing tabs in glfsxmp.c with whitespace	Lalatendu Mohanty	2013-10-27	1	-1450/+1450
*	libgfapi: Fix to compilation failure/warnings for examples/glfsxmp.c	Lalatendu Mohanty	2013-10-16	3	-18/+32
*	gfapi: object handle based API extensions	R.Shyamsundar	2013-10-11	1	-5/+1359
*	gfapi.py: support dynamic loading of versioned libraries	Niels de Vos	2013-10-02	3	-10/+44
*	glusterfs: discard (hole punch) support	Brian Foster	2013-06-13	1	-2/+7
*	gluster: add fallocate fop support	Brian Foster	2013-06-13	1	-0/+14
*	gfapi: support for chdir() and family	Anand Avati	2013-04-19	1	-2/+79
*	api: update Python wrapper	Jeff Darcy	2012-12-19	1	-24/+395
*	libgfapi: "tcp" is documented as the valid transport type instead of "socket".	Avra Sengupta	2012-11-28	2	-3/+3
*	api/examples: updated examples to use new calls	Anand Avati	2012-11-05	1	-0/+87
*	glfsxmp extension	Anand Avati	2012-08-02	1	-5/+31
*	Example of using libglfs from Python.	Jeff Darcy	2012-07-18	1	-0/+29
*	glfsxmp: libgfapi based example	Anand Avati	2012-07-18	5	-0/+97