Merge "Database transaction flushing cleanups"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 16 Aug 2016 22:03:43 +0000 (22:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 16 Aug 2016 22:03:43 +0000 (22:03 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 16 Aug 2016 22:03:43 +0000 (22:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 16 Aug 2016 22:03:43 +0000 (22:03 +0000)
diff --cc includes/WatchedItemStore.php
Simple merge
diff --cc includes/db/Database.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 16 Aug 2016 22:03:43 +0000 (22:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 16 Aug 2016 22:03:43 +0000 (22:03 +0000)
		1	2
includes/WatchedItemStore.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/Database.php	patch \|	diff1 \|	diff2 \|	blob \| history