Merge pull request #228 from delphix/master

Merge branch 'master' into '6.0/stage'

Author: sdimitro

sdb/commands/internal/__init__.py

@@ -24,7 +24,3 @@
     if path != __file__:
         module = os.path.splitext(os.path.basename(path))[0]
         importlib.import_module("sdb.commands.internal.{}".format(module))
-
-for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))):
-    module = os.path.basename(os.path.dirname(path))
-    importlib.import_module("sdb.commands.internal.{}".format(module))

sdb/commands/linux/internal/__init__.py

@@ -24,7 +24,3 @@
     if path != __file__:
         module = os.path.splitext(os.path.basename(path))[0]
         importlib.import_module("sdb.commands.linux.internal.{}".format(module))
-
-for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))):
-    module = os.path.basename(os.path.dirname(path))
-    importlib.import_module("sdb.commands.linux.internal.{}".format(module))

sdb/commands/spl/internal/__init__.py

@@ -24,7 +24,3 @@
     if path != __file__:
         module = os.path.splitext(os.path.basename(path))[0]
         importlib.import_module("sdb.commands.spl.internal.{}".format(module))
-
-for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))):
-    module = os.path.basename(os.path.dirname(path))
-    importlib.import_module("sdb.commands.spl.internal.{}".format(module))

tests/integration/data/regression_output/linux/stacks

@@ -241,6 +241,12 @@ TASK_STRUCT        STATE             COUNT
                   ret_from_fork+0x1f
 
 0xffffa08966a01700 RUNNING               1
+                  __schedule+0x2c0
+                  schedule+0x2c
+                  schedule_timeout+0x169
+                  rcu_gp_kthread+0x572
+                  kthread+0x121
+                  ret_from_fork+0x1f
 
 0xffffa08966a6dc00 INTERRUPTIBLE         1
                   __schedule+0x2c0

tests/integration/data/regression_output/linux/stacks -a

@@ -765,6 +765,12 @@ TASK_STRUCT        STATE
                   ret_from_fork+0x1f
 
 0xffffa08966a01700 RUNNING         
+                  __schedule+0x2c0
+                  schedule+0x2c
+                  schedule_timeout+0x169
+                  rcu_gp_kthread+0x572
+                  kthread+0x121
+                  ret_from_fork+0x1f
 
 0xffffa08966a6dc00 INTERRUPTIBLE   
                   __schedule+0x2c0