projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-2.6'
[ganeti-local]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
ab52962
..
13ce302
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-38,7
+38,6
@@
# daemons
/daemons/daemon-util
# daemons
/daemons/daemon-util
-/daemons/ensure-dirs
/daemons/ganeti-cleaner
/daemons/ganeti-confd
/daemons/ganeti-masterd
/daemons/ganeti-cleaner
/daemons/ganeti-confd
/daemons/ganeti-masterd
@@
-72,6
+71,8
@@
# lib
/lib/_autoconf.py
# lib
/lib/_autoconf.py
+/lib/_vcsversion.py
+/lib/_generated_rpc.py
# man
/man/*.[0-9]
# man
/man/*.[0-9]
@@
-99,14
+100,15
@@
/htools/.hpc
/htools/coverage
/htools/.hpc
/htools/coverage
-/htools/hbal
-/htools/hscan
-/htools/hail
-/htools/hspace
+/htools/htools
+/htools/hconfd
+/htools/hpc-htools
/htools/test
/htools/*.prof*
/htools/*.stat
/htools/*.tix
/.hpc/
/htools/test
/htools/*.prof*
/htools/*.stat
/htools/*.tix
/.hpc/
+/*.tix
/htools/Ganeti/HTools/Version.hs
/htools/Ganeti/HTools/Version.hs
+/htools/Ganeti/Constants.hs