From 1cb28d0992e3f5d3a91daeb3f7ff8991f41b68ed Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Mon, 18 Sep 2006 16:55:01 +0000
Subject: 2006-09-18  Martin Hunt  <hunt@redhat.com>

	* buildrun.cxx (run_pass): Remove "-m" option to stpd.
	* translate.cxx (translate_pass): #define STP_RELAYFS_MERGE
	if appropriate.
---
 buildrun.cxx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'buildrun.cxx')

diff --git a/buildrun.cxx b/buildrun.cxx
index 0062abea..1c21d1c5 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -129,7 +129,6 @@ run_pass (systemtap_session& s)
   string stpd_cmd = string("sudo ") 
     + string(PKGLIBDIR) + "/stpd "
     + (s.verbose>1 ? "" : "-q ")
-    + (s.merge ? "" : "-m ")
     + "-u " + username + " "
     + (s.output_file.empty() ? "" : "-o " + s.output_file + " ");
   
-- 
cgit