merge of '0bf1803f4554f830aee970415fcd6c9b6c4d2747'

and '98a4dbd3af97e8892dafc24a4ebbcc6b2ff30afe'
This commit is contained in:
zzz
2016-06-06 21:55:04 +00:00
10 changed files with 26 additions and 38 deletions

View File

@ -1492,7 +1492,7 @@ public class BlockfileNamingService extends DummyNamingService {
rv = lookupAll2(hostname, lookupOptions, storedOptions);
}
}
// we sort the destinations in addDestionation(),
// we sort the destinations in addDestination(),
// which is a lot easier than sorting them here
return rv;
}