# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1491693958 -7200
# Node ID 5abb6bc45edd6cd6f8db457cf32a11116d522663
# Parent  36d9c1226fbcb3f8ae7eb32e60dc6fa65d10eec9# Parent  91550b6f93d20e636bd4196deb0f8eb086736c67
Merge 0.10->trunk

diff -r 36d9c1226fbc -r 5abb6bc45edd prosodyctl
--- a/prosodyctl	Sat Apr 08 00:48:15 2017 +0200
+++ b/prosodyctl	Sun Apr 09 01:25:58 2017 +0200
@@ -973,6 +973,13 @@
 				print("    For more information see https://prosody.im/doc/storage");
 			end
 		end
+		for host, config in pairs(config) do
+			if type(rawget(config, "storage")) == "string" and rawget(config, "default_storage") then
+				print("");
+				print("    The 'default_storage' option is not needed if 'storage' is set to a string.");
+				break;
+			end
+		end
 		local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
 		local ssl = dependencies.softreq"ssl";
 		if not ssl then
diff -r 36d9c1226fbc -r 5abb6bc45edd tools/migration/migrator/prosody_sql.lua
--- a/tools/migration/migrator/prosody_sql.lua	Sat Apr 08 00:48:15 2017 +0200
+++ b/tools/migration/migrator/prosody_sql.lua	Sun Apr 09 01:25:58 2017 +0200
@@ -161,7 +161,7 @@
 	local insert_sql = "INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)";
 
 	return function(item)
-		if not item then return end -- end of input
+		if not item then assert(engine.conn:commit()) return end -- end of input
 		local host = item.host or "";
 		local user = item.user or "";
 		for store, data in pairs(item.stores) do