Merge branch 'MDL-52217-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 21:56:02 +0000 (05:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 21:56:02 +0000 (05:56 +0800)
Conflicts:
repository/upgrade.txt

1  2 
lib/db/upgrade.php
repository/upgrade.txt

Simple merge
@@@ -5,12 -5,9 +5,15 @@@ http://docs.moodle.org/dev/Repository_A
  
  === 3.1 ===
  
 +* The following functions, previously used (exclusively) by upgrade steps are not available
 +  anymore because of the upgrade cleanup performed for this version. See MDL-51580 for more info:
 +    - repository_picasa_admin_upgrade_notification()
 +    - repository_googledocs_admin_upgrade_notification()
 +    - repository_boxnet_admin_upgrade_notification()
 +    - repository_alfresco_admin_security_key_notice()
+ * The prepare_file() function will now return a file in a per-request directory which will
+   be automatically cleaned at the end of the request.
+   No modifications should be required as a result of this change.
  
  === 2.8 ===