for #319, merge from 2.0release

ossrs · Sep 9, 2015 · a88f321 · a88f321
2 parents c4feb8f + abd7ee2
commit a88f321
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/trunk/src/app/srs_app_reload.cpp b/trunk/src/app/srs_app_reload.cpp
@@ -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;
 }

diff --git a/trunk/src/app/srs_app_reload.hpp b/trunk/src/app/srs_app_reload.hpp
@@ -44,8 +44,8 @@ class ISrsReloadHandler
     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();