[SCM] systemtap: system-wide probe/trace tool branch, master, updated. release-0.8-265-g470ac2a

[SCM] systemtap: system-wide probe/trace tool branch, master, updated. release-0.8-265-g470ac2a

[wcohen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "systemtap: system-wide probe/trace tool".

The branch, master has been updated
       via  470ac2acd8a52f33e9ce020d38ea2d0881e6cc84 (commit)
       via  7a13f89ffc608e36302c43969d29fe08a589b5d7 (commit)
       via  7627c52330b476c13498144cd1288be0f5869e0f (commit)
      from  3d65f39002440cfdeeac94d7a7a6c9a7aead2e54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 470ac2acd8a52f33e9ce020d38ea2d0881e6cc84
Author: William Cohen <wcohen@redhat.com>
Date:   Mon Feb 2 10:02:13 2009 -0500

    Merge ChangeLog conflict

commit 7a13f89ffc608e36302c43969d29fe08a589b5d7
Merge: 7627c52330b476c13498144cd1288be0f5869e0f 3d65f39002440cfdeeac94d7a7a6c9a7aead2e54
Author: William Cohen <wcohen@redhat.com>
Date:   Mon Feb 2 09:48:58 2009 -0500

    Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
    
    Conflicts:
    	testsuite/ChangeLog

commit 7627c52330b476c13498144cd1288be0f5869e0f
Author: William Cohen <wcohen@redhat.com>
Date:   Fri Jan 30 17:00:15 2009 -0500

    Remove systemtap.samples/queue_demo.{exp|stp}.

-----------------------------------------------------------------------

Summary of changes:
 testsuite/ChangeLog                        |    5 ++++
 testsuite/systemtap.samples/queue_demo.exp |   13 -----------
 testsuite/systemtap.samples/queue_demo.stp |   32 ----------------------------
 3 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 testsuite/systemtap.samples/queue_demo.exp
 delete mode 100644 testsuite/systemtap.samples/queue_demo.stp


hooks/post-receive
--
systemtap: system-wide probe/trace tool