Merge branch 'wip-mdl-58068' of https://github.com/rajeshtaneja/moodle

nilo72 · Apr 10, 2017 · 1adae85 · 1adae85
2 parents b140b13 + db4b59f
commit 1adae85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/behat/lib.php b/lib/behat/lib.php
@@ -220,7 +220,7 @@ function behat_clean_init_config() {
         'umaskpermissions', 'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix',
         'dboptions', 'proxyhost', 'proxyport', 'proxytype', 'proxyuser', 'proxypassword',
         'proxybypass', 'theme', 'pathtogs', 'pathtodu', 'aspellpath', 'pathtodot', 'skiplangupgrade',
-        'altcacheconfigpath', 'pathtounoconv'
+        'altcacheconfigpath', 'pathtounoconv', 'alternative_file_system_class'
     ));
 
     // Add extra allowed settings.

diff --git a/lib/phpunit/bootstrap.php b/lib/phpunit/bootstrap.php
@@ -186,7 +186,7 @@
                  'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix', 'dboptions',
                  'proxyhost', 'proxyport', 'proxytype', 'proxyuser', 'proxypassword', 'proxybypass', // keep proxy settings from config.php
                  'altcacheconfigpath', 'pathtogs', 'pathtodu', 'aspellpath', 'pathtodot',
-                 'pathtounoconv'
+                 'pathtounoconv', 'alternative_file_system_class'
                 );
 $productioncfg = (array)$CFG;
 $CFG = new stdClass();