Merge pull request #43 from ErikFang/master

bug fix
Merge pull request #20 from dianping/master

sync
Merge pull request #44 from ErikFang/master

fix getClosestRollTs UTC CST issue when period is 1day
Merge pull request #21 from dianping/master

sync
bug a fix that fileRotate() could be invoked more than once in an actual file rotate activity
fix the bug that fileRotate() could be invoked more than once in an actual file rotate activity
Merge branch 'master' of github.com:cltlfcjin/blackhole
Merge pull request #46 from ErikFang/master

review duplicated completefile() call
Merge pull request #22 from dianping/master

sync
keep handle() simple and stupid
Merge branch 'master' of github.com:cltlfcjin/blackhole
Merge pull request #45 from LantaoJin/master

fix the bug that fileRotate() could be invoked more than once
Merge pull request #23 from dianping/master

sync
log4j
fix IO-297 in our inner version and rotate bug
Merge pull request #47 from LantaoJin/master

log4j plus to comma
Merge pull request #6 from dianping/master

sync