diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
| commit | a827c5eab32a43ade5551259ea56a6a1af7e861b (patch) | |
| tree | e6707df68f72baa8645210ba931272285116ad85 /.gitignore | |
| parent | 46d333783a968ab39e0beade9c7a1eec8035f8b1 (diff) | |
| parent | 99bfc2a2a1689da1e173cb2f8ef54d2b09ef3a5d (diff) | |
Merge branch 'upstream'
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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index e8d0012aa..adedb3585 100644 --- a/.gitignore +++ b/.gitignore @@ -18,15 +18,18 @@ py-compile *.o *.tar.gz *.rpm +*.diff +*.patch .libs .deps 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/argp-standalone/libargp.a contrib/uuid/uuid_types.h extras/init.d/glusterd-Debian extras/init.d/glusterd-Redhat @@ -48,5 +51,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 |