Merge remote-tracking branch 'origin/map_perm' into dev

375a2431 · yumaojun · 70e6904e · e5c10710 · 375a2431
Commit 375a2431 authored Nov 17, 2015 by yumaojun
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

jumpserver.conf jumpserver.conf +1 -1

No files found.
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -9,7 +9,7 @@ log = debug
 host = 127.0.0.1
 port = 3306
 user = jumpserver
-password = mysql234
+password = mysql1234
 database = jumpserver
 [websocket]