Merge pull request #824 from prometheus/fabxc/gitignore

git: ignore promtool, be less strict about config files.
This commit is contained in:
Fabian Reinartz 2015-06-23 12:08:15 +02:00
commit 37dea6a251

9
.gitignore vendored
View file

@ -3,10 +3,9 @@
*.a[568o] *.a[568o]
*.cgo*.c *.cgo*.c
*.cgo*.go *.cgo*.go
*.conf /*.yaml
*.yaml /*.yml
*.yml /*.rules
*.rules
*.exe *.exe
*.orig *.orig
*.pyc *.pyc
@ -23,13 +22,13 @@
._* ._*
.nfs.* .nfs.*
/.git /.git
/.gitignore
[568a].out [568a].out
_cgo_* _cgo_*
core core
*-stamp *-stamp
/prometheus /prometheus
/promtool
benchmark.txt benchmark.txt
/data /data