From de1f0a048738958435904c411685d01817c68a2c Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 29 Jan 2015 11:53:21 +0000
Subject: [PATCH] Avoid confusion by clarifying an inline comment on logic for
 performing multisite upgrades.

Props dmchale for the initial patch.
Fixes #30837.

Built from https://develop.svn.wordpress.org/trunk@31297


git-svn-id: http://core.svn.wordpress.org/trunk@31278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin.php      | 6 +++++-
 wp-includes/version.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 1040995f1b..22813cc74f 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -63,7 +63,11 @@ if ( get_option('db_upgraded') ) {
 	 */
 	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
 		$c = get_blog_count();
-		// If 50 or fewer sites, run every time. Else, run "about ten percent" of the time. Shh, don't check that math.
+
+		/*
+		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
+		 * attempt to do no more than threshold value, with some +/- allowed.
+		 */
 		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
 			require_once( ABSPATH . WPINC . '/http.php' );
 			$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b1834c5d5e..a8aacf381a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31296';
+$wp_version = '4.2-alpha-31297';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.