From f7a815a2d0e7e9d7ed1ec2da587790bd3ddda9e5 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Fri, 21 Mar 2014 20:13:16 +0000 Subject: features/glupy: Rename Glupy python module to avoid namespace conflict * Rename gluster.py to glupy.py to avoid namespace conflict (#1018619) * Move the main Glupy files into glusterfs-extra-xlators rpm * Move the Glupy Translator examples into glusterfs-devel rpm * Add Glupy entry to the MAINTAINERS file BUG: 1018619 Change-Id: I48de598ba5ae8eec0e7e276bbcca1abb0e549cef Signed-off-by: Justin Clift Reviewed-on: http://review.gluster.org/6979 Reviewed-by: Kaleb KEITHLEY Reviewed-by: Jeff Darcy --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e8d0012aa..08bd0dae2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,8 @@ Makefile stamp-h1 # Generated files -api/examples/__init__.py* +api/examples/__init__.py +api/examples/__init__.py? api/examples/setup.py argp-standalone/libargp.a contrib/uuid/uuid_types.h @@ -48,5 +49,6 @@ libtool run-tests.sh xlators/mount/fuse/utils/mount.glusterfs xlators/mount/fuse/utils/mount_glusterfs +xlators/features/glupy/src/setup.py geo-replication/src/peer_add_secret_pub geo-replication/src/peer_gsec_create -- cgit From b66568b6cb6694016f95e9d5a5220d3bde76907d Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 26 Mar 2014 16:55:12 -0700 Subject: build: move argp-standalone into contrib/ directory Change-Id: Iedcddf95c3577da644c0aebbb297b04c93f1b6fe BUG: 1081274 Signed-off-by: Harshavardhana Reviewed-on: http://review.gluster.org/7352 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 08bd0dae2..adedb3585 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ py-compile *.o *.tar.gz *.rpm +*.diff +*.patch .libs .deps Makefile @@ -27,7 +29,7 @@ stamp-h1 api/examples/__init__.py api/examples/__init__.py? api/examples/setup.py -argp-standalone/libargp.a +contrib/argp-standalone/libargp.a contrib/uuid/uuid_types.h extras/init.d/glusterd-Debian extras/init.d/glusterd-Redhat -- cgit