Merge seastar upstream

* seastar 10e09b0...2e041c2 (7):
  > Merge "Change app_template::run() to terminate when callback is done" from Tomasz
  > resource: Fix compilation for hwloc version 1.8.0
  > memory: Fix infinite recursion when throwing std::bad_alloc
  > core/reactor: Throw the right error code when connect() fails
  > future: improve exception safety
  > xen: add missing virtual destructors
  > circular_buffer: do not destroy uninitialized object

app_template::run() users updated to call app_template::run_depracated().
This commit is contained in:
Avi Kivity
2015-08-28 23:45:05 +03:00
parent 012fd41fc0
commit c734ef2b72
7 changed files with 7 additions and 7 deletions

View File

@@ -92,7 +92,7 @@ int main(int ac, char** av) {
auto& mm = service::get_migration_manager();
api::http_context ctx(db, proxy);
return app.run(ac, av, [&] {
return app.run_deprecated(ac, av, [&] {
if (help_loggers) {
do_help_loggers();
engine().exit(1);