add @lockTimeout option#2

Open

kklem0 wants to merge 3 commits intoMichelleUfford:masterfrom

Commits on Oct 14, 2015

add @lockTimeout option
kklem0
committed

Commits on Oct 15, 2015

fix a typo
kklem0
committed

Commits on Nov 13, 2015

change the unit to second on timeout, and only timeout when @lockTimeout is bigger than 0
kklem0
committed