for , merge from 2.0release

pull/556/head
winlin
commit a88f321d8b

@ -40,12 +40,12 @@ int ISrsReloadHandler::on_reload_listen()
return ERROR_SUCCESS;
}
int ISrsReloadHandler::on_reload_max_conns()
int ISrsReloadHandler::on_reload_utc_time()
{
return ERROR_SUCCESS;
}
int ISrsReloadHandler::on_reload_utc_time()
int ISrsReloadHandler::on_reload_max_conns()
{
return ERROR_SUCCESS;
}

@ -44,8 +44,8 @@ public:
ISrsReloadHandler();
virtual ~ISrsReloadHandler();
public:
virtual int on_reload_max_conns();
virtual int on_reload_utc_time();
virtual int on_reload_max_conns();
virtual int on_reload_listen();
virtual int on_reload_pid();
virtual int on_reload_log_tank();

Loading…
Cancel
Save