Bug 983780 - parse log files separately and compare timestamps on merge
Merge pull request #3073 from rmillner/awakenings

Merged by openshift-bot