Merge branch 'prefixdbname' of git://github.com/mudrd8mz/mdk
authorFrederic Massart <fred@moodle.com>
Mon, 21 Jul 2014 02:04:12 +0000 (10:04 +0800)
committerFrederic Massart <fred@moodle.com>
Mon, 21 Jul 2014 02:04:12 +0000 (10:04 +0800)
Conflicts:
config-dist.json

1  2 
config-dist.json
lib/commands/create.py

  
      // Database access
      "db": {
+         // Name prefix for all databases created by mdk. Affects the database name only, not the tables.
+         "namePrefix": "",
 +        "mariadb": {
 +            "host": "localhost",
 +            "port": "3306",
 +            "user": "root",
 +            "passwd": "root"
 +        },
          "mysqli": {
              "host": "localhost",
              "port": "3306",
Simple merge