This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: * StartRun.java: Fix merge error
- From: rmoseley at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 20 Mar 2008 20:41:05 -0000
- Subject: [SCM] master: * StartRun.java: Fix merge error
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 4fef9765b59a925c333c1c1c53091e789857b6a9 (commit)
from 3b36d485999bed1d4e1b6fa7d4922332d8adfe74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 4fef9765b59a925c333c1c1c53091e789857b6a9
Author: Rick Moseley <rmoseley@dhcp-215.hsv.redhat.com>
Date: Thu Mar 20 15:40:36 2008 -0500
* StartRun.java: Fix merge error
* StartRun.java: Fix merge error.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/hpd/ChangeLog | 2 ++
frysk-core/frysk/hpd/StartRun.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 1833729..734d9cb 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -9,6 +9,8 @@
* TestStartCommand.java: Ditto.
* LoadCommand.java: Add new method for loaded procs listing.
* TestLoadCommand.java: Modify test for above.
+
+ * StartRun.java: Fix merge error.
2008-03-18 Andrew Cagney <cagney@redhat.com>
diff --git a/frysk-core/frysk/hpd/StartRun.java b/frysk-core/frysk/hpd/StartRun.java
index f648ad1..8a3f971 100644
--- a/frysk-core/frysk/hpd/StartRun.java
+++ b/frysk-core/frysk/hpd/StartRun.java
@@ -42,7 +42,6 @@ package frysk.hpd;
import frysk.proc.Action;
import frysk.proc.Manager;
import frysk.proc.Proc;
-import frysk.proc.ProcObserver.ProcTasks;
import frysk.proc.ProcTasksObserver;
import frysk.proc.Task;
import frysk.proc.TaskAttachedObserverXXX;
@@ -234,4 +233,4 @@ abstract class StartRun extends ParameterizedCommand {
return CompletionFactory.completeFileName(cli, input, cursor,
completions);
}
-}
\ No newline at end of file
+}
hooks/post-receive
--
frysk system monitor/debugger