projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
46c8c04
..
5202bc2
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-33,10
+33,13
@@
src/stamp-h1
.libs/
src/collectd
src/collectd-nagios
.libs/
src/collectd
src/collectd-nagios
+src/collectd-tg
+src/collectdctl
src/collectdmon
src/*.1
src/*.5
src/collectdmon
src/*.1
src/*.5
-src/libcollectdclient/lcc_features.h
+src/.pod2man.tmp.*
+src/libcollectdclient/collectd/lcc_features.h
# patch stuff
*.rej
# patch stuff
*.rej
@@
-48,6
+51,9
@@
src/liboconfig/parser.c
src/liboconfig/parser.h
src/liboconfig/scanner.c
src/liboconfig/parser.h
src/liboconfig/scanner.c
+# protobuf stuff:
+src/*.pb-c.[ch]
+
# make dist stuff:
/collectd-*.tar.gz
/collectd-*.tar.bz2
# make dist stuff:
/collectd-*.tar.gz
/collectd-*.tar.bz2
@@
-57,7
+63,28
@@
bindings/.perl-directory-stamp
bindings/perl/Collectd/pm_to_blib
bindings/perl/blib/
bindings/perl/pm_to_blib
bindings/perl/Collectd/pm_to_blib
bindings/perl/blib/
bindings/perl/pm_to_blib
+bindings/buildperl
# java stuff
bindings/java/java-build-stamp
bindings/java/org/collectd/api/*.class
# java stuff
bindings/java/java-build-stamp
bindings/java/org/collectd/api/*.class
+bindings/java/org/collectd/java/*.class
+
+# python stuff
+*.pyc
+
+# tag stuff
+src/tags
+
+# backup stuff
+*~
+# tests stuff
+src/tests/.deps/
+src/tests/mock/.deps/
+src/tests/.dirstamp
+src/tests/mock/.dirstamp
+
+# new daemon repo
+src/daemon/.deps/
+src/daemon/.dirstamp
+src/daemon/collectd