branch for release-2.5 release
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
change triggermanager synchronization to use the same lock object as the
scanner thread
scanner thread does syncObj.wait while waiting
add better description of sla triggers
add orphan process clean up script
minor change to make everything of scanner thread wrapped inside a big
sync block
fix Issue #119
Merge pull request #120 from maczpc/master

fix Issue #119 (Exception in thread "TriggerRunnerManager-Trigger-Scanner-Thread" java.lang.IllegalMonitorStateException)
Merge branch 'master' of github.com:azkaban/azkaban2
added test case to mimick the deadlock that happened when
TriggerScannerThread is processing all triggers, some of them try to
insert new triggers, and another thread also tries to insert trigger
into the system
delete the orphan process cleaning script as its usefulness is unclear
and people could write up their own script if the orphan processes do
appear
Merge pull request #118 from cjyu/master

clean up trigger scanner thread sync blocks and add orphan process sweeping script
Merge branch 'master' into ui-tweaks