Remotes/upstream/v0.12.1.x triggers#6

Merged

eduffield222 merged 6 commits into

eduffield222:v0.12.1.x-triggersfrom

tgflynn:remotes/upstream/v0.12.1.x-triggers

Aug 8, 2016

Commits on Aug 6, 2016

- Added trigger manager cs locking
Tim Flynn
committed

Commits on Aug 8, 2016

- Simplified trigger manager locking to avoid a deadlock
Tim Flynn
committed
- Added fExpired flag to CGovernanceObject so that trigger removal
Tim Flynn
committed
Merge remote-tracking branch 'remotes/upstream/v0.12.1.x-triggers' into remotes/upstream/v0.12.1.x-triggers
Tim Flynn
committed
Changes to allow removal of time expired triggers
Tim Flynn
committed
Wrapped GetHash printf with DBG macro
Tim Flynn
committed