diff options
author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
commit | e139b4d0ba2286c0d4d44ba81260c2b287016019 (patch) | |
tree | 0a21f0761528e0f79da0a9f67106eb128ace0cf7 /.gitignore | |
parent | 73b60c87ca7f62517a8466431f5a8cf167589c8c (diff) | |
parent | f2bac9f9d5b9956969ddd25a54bc636b82f6923e (diff) |
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
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index adedb3585..7e8e11c70 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ install-sh ltmain.sh Makefile.in missing -py-compile +*compile *.gcda *.gcno *.sw? @@ -24,6 +24,9 @@ py-compile .deps Makefile stamp-h1 +# Softlinks to test and log +log +*.vol # Generated files api/examples/__init__.py @@ -39,11 +42,14 @@ extras/systemd/glusterd.service extras/ocf/glusterd extras/ocf/volume extras/who-wrote-glusterfs/gitdm +extras/geo-rep/gsync-sync-gfid glusterfs-api.pc glusterfs.spec glusterfsd/src/glusterfsd +glusterfsd/src/glusterd +glusterfsd/src/glusterfs libgfchangelog.pc -libglusterfs/src/spec.lex.c +libglusterfs/src/graph.lex.c libglusterfs/src/y.tab.c libglusterfs/src/y.tab.h libglusterfs/src/gf-error-codes.h @@ -54,3 +60,7 @@ 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 +geo-replication/src/gsyncd +cli/src/gluster +contrib/fuse-util/fusermount-glusterfs +geo-replication/src/gsyncd |