Added Cancelled state to represent a job which cancelled due to previous failures.
Wrapping code lines greater than 100 chars
Code formatting. Added spaces between if ( and for (
Merge branch 'master' of github.com:azkaban/azkaban2
Merge branch 'release-2.5' of github.com:azkaban/azkaban2
Reordered the switch statement and adding comment to make the behaviour less ambiguous.
Merge pull request #115 from azkaban/killCancelChanges

Added Cancelled state to represent a job which cancelled due to previous errors
fix Issue #119
Merge pull request #120 from maczpc/master

fix Issue #119 (Exception in thread "TriggerRunnerManager-Trigger-Scanner-Thread" java.lang.IllegalMonitorStateException)