diff options
| author | William Cohen <wcohen@redhat.com> | 2009-02-02 10:02:13 -0500 |
|---|---|---|
| committer | William Cohen <wcohen@redhat.com> | 2009-02-02 10:02:13 -0500 |
| commit | 470ac2acd8a52f33e9ce020d38ea2d0881e6cc84 (patch) | |
| tree | 8897178654cb21be799692e454139129464d0217 /testsuite | |
| parent | 7a13f89ffc608e36302c43969d29fe08a589b5d7 (diff) | |
| download | systemtap-steved-470ac2acd8a52f33e9ce020d38ea2d0881e6cc84.tar.gz systemtap-steved-470ac2acd8a52f33e9ce020d38ea2d0881e6cc84.tar.xz systemtap-steved-470ac2acd8a52f33e9ce020d38ea2d0881e6cc84.zip | |
Merge ChangeLog conflict
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index f44c6488..542df531 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,15 +1,12 @@ -<<<<<<< HEAD:testsuite/ChangeLog +2009-02-01 Stan Cox <scox@redhat.com> + + * systemtap.base/labels.exp: New. + 2009-01-30 Will Cohen <wcohen@redhat.com> * systemtap.samples/queue_demo.exp: * systemtap.samples/queue_demo.stp: Remove. -======= -2009-02-01 Stan Cox <scox@redhat.com> - - * systemtap.base/labels.exp: New. - ->>>>>>> 3d65f39002440cfdeeac94d7a7a6c9a7aead2e54:testsuite/ChangeLog 2009-01-30 Frank Ch. Eigler <fche@elastic.org> * semok/twenty.stp: Don't spew so much into systemtap.log. |