Merge branch 'master' into TreeModeBugfix

Author: luxiaoyong

doc/sphinx/tools/clush.rst

@@ -773,7 +773,7 @@ specifying the case-sensitive full Python module name of a worker module.
 
 
 .. [#] LLNL parallel remote shell utility
-   (https://computing.llnl.gov/linux/pdsh.html)
+   (https://software.llnl.gov/repo/#!/chaos/pdsh)
 
 .. _seq(1): http://linux.die.net/man/1/seq
 .. _Python unified diff:

tests/TreeTopologyTest.py

@@ -527,7 +527,7 @@ def testWildcardsUnresolvedRouters(self):
                            '- Controller-vm[2,30]\n'
             self.assertEqual(str(tree), display_ref1)
 
-    def testWildcardsUnresolvedDestionation(self):
+    def testWildcardsUnresolvedDestination(self):
         """test topology with node groups and wildcards (unresolved dest)"""
         with NamedTemporaryFile() as tmpfile:
             tmpfile.write(b'[routes]\n')