Conflicts:
.gitignore
glusterfs.spec
glusterfsd.init
glusterfsd.logrotate
glusterfsd.sysconfig
sources
Jump from 2.0.9 to 3.3.0 on el5 branch. Intervening commits will have
to be reconstructed from commits on other branches if you want to build
the respective versions for el5.
- Update files to match the new default vol file names.
- Include logrotate for glusterfsd, use a pid file by default.
- Include logrotate for glusterfs, using killall for lack of anything
better.
