brooklyncentral/brooklyn — pull request #1368 by ahgittin (2014-05-07 10:23:35+00:00)
Title: NO MERGE YET - more high availability - applying fixes to #1362

applying the fixes suggested in #1362 (also the tiny ones from #1366)