Just check for cloudcafe being installed, rather than whether the dev config is installed
Just kidding, actually fix it
Comment out attempt to run integration tests on jenkins for now until we have a node set up
Merge branch 'master' into makefile_cloudcafe
first cut at the otterclock.  Won't request after the first batch of yet or
delete.
Bump the silverberg version
Add with_lock call to otter.controller.maybe_execute_scaling_policy with accompanying tests
Clean up the store after a run of RestAPITestMixin
Use *args in addCleanup
committing broken code; trying to get the part where it retries multiple requests working.
fix unit tests.
Merge branch 'master' into auto_377_there_otter_be_an_otterclock
fix lint.
fix up the test cases to be a little less clunky..
adding deletion of events after they have been triggered.
Merge branch 'master' into auto_377_there_otter_be_an_otterclock
Merge branch 'master' into auto_377_there_otter_be_an_otterclock
using loopingcall to make this work.
Merge branch 'master' into auto_377_there_otter_be_an_otterclock
Oops.