Merge branch 'master' into release

laravel · Nov 1, 2020 · af7ca89 · af7ca89
2 parents 40be5e3 + 40f4dbe
commit af7ca89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bin/homestead b/bin/homestead
@@ -3,7 +3,7 @@
 
 require __DIR__.'/../../../autoload.php';
 
-$app = new Symfony\Component\Console\Application('Laravel Homestead', '10.15.1');
+$app = new Symfony\Component\Console\Application('Laravel Homestead', '10.15.2');
 
 $app->add(new Laravel\Homestead\MakeCommand);
 

diff --git a/scripts/homestead.rb b/scripts/homestead.rb
@@ -534,9 +534,9 @@ def self.configure(config, settings)
       end
 
       settings['databases'].each do |db|
-        if enabled_databases.include? 'mysql'
+        if (enabled_databases.include? 'mysql') || (enabled_databases.include? 'mariadb')
           config.vm.provision 'shell' do |s|
-            s.name = 'Creating MySQL Database: ' + db
+            s.name = 'Creating MySQL / MariaDB Database: ' + db
             s.path = script_dir + '/create-mysql.sh'
             s.args = [db]
           end