Attempt to fix up some merge errors with crashdump hooks

Signed-off-by: Martin J. Bligh <mbligh@google.com>



git-svn-id: http://test.kernel.org/svn/autotest/trunk@884 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/server_job.py b/server/server_job.py
index 8cc78ff..665c4ec 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -47,6 +47,14 @@
 	run_client(machines[0])
 """
 
+crashdumps = """
+def crashdumps(machine):
+	host = hosts.SSHHost(machine, initialize=False)
+	host.get_crashdumps(test_start_time)
+
+parallel_simple(crashdumps, machines, log=False)
+"""
+
 cleanup="""\
 def cleanup(machine):
 		host = hosts.SSHHost(machine, initialize=False)