public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: rmoseley@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM] master: * StartRun.java: Fix merge error
Date: Thu, 20 Mar 2008 20:41:00 -0000 [thread overview]
Message-ID: <20080320204105.12161.qmail@sourceware.org> (raw)
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
reply other threads:[~2008-03-20 20:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080320204105.12161.qmail@sourceware.org \
--to=rmoseley@sourceware.org \
--cc=frysk-cvs@sourceware.org \
--cc=frysk@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).