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
f005edd
..
b14cc7a
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-20,7
+20,6
@@
Makefile
config.log
config.status
libtool
config.log
config.status
libtool
-src/.deps
src/collectd.conf
src/config.h
src/libcollectdclient/libcollectdclient.pc
src/collectd.conf
src/config.h
src/libcollectdclient/libcollectdclient.pc
@@
-31,7
+30,7
@@
src/stamp-h1
*.lo
*.o
.libs/
*.lo
*.o
.libs/
-src/collectd
+.deps/
src/collectd-nagios
src/collectd-tg
src/collectdctl
src/collectd-nagios
src/collectd-tg
src/collectdctl
@@
-40,7
+39,6
@@
src/*.1
src/*.5
src/.pod2man.tmp.*
src/libcollectdclient/collectd/lcc_features.h
src/*.5
src/.pod2man.tmp.*
src/libcollectdclient/collectd/lcc_features.h
-src/utils_vl_lookup_test
# patch stuff
*.rej
# patch stuff
*.rej
@@
-74,16
+72,11
@@
bindings/java/org/collectd/java/*.class
# python stuff
*.pyc
# python stuff
*.pyc
-# tag stuff
-src/tags
-
# backup stuff
*~
# backup stuff
*~
-#
tests stuff
-src/tests/
.deps/
-src/tests/mock/.deps/
+#
Unit tests
+src/tests/
+test_*
-# new daemon repo
-src/daemon/.deps/
-src/daemon/.dirstamp
+# src/daemon/...
src/daemon/collectd
src/daemon/collectd