diff options
| author | David Smith <dsmith@redhat.com> | 2009-09-01 15:20:39 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-09-01 15:20:39 -0500 |
| commit | 635035ca64e9c6e6ad8252545446bbf9bc2a9c55 (patch) | |
| tree | 33c024e1ee5e3c9be667378182e4189855b0ac86 /hash.cxx | |
| parent | 4569f6bb769482d732f72fb1208522d51f4e36f4 (diff) | |
| download | systemtap-steved-635035ca64e9c6e6ad8252545446bbf9bc2a9c55.tar.gz systemtap-steved-635035ca64e9c6e6ad8252545446bbf9bc2a9c55.tar.xz systemtap-steved-635035ca64e9c6e6ad8252545446bbf9bc2a9c55.zip | |
PR10552: Removed references to the merge ('-M') option.
* hash.cxx (find_script_hash): Removed unused merge option.
* main.cxx (checkOptions): Removed merge option checks.
(main): Removed merge option.
* session.h: Ditto.
* initscript/README.initscript: Removed reference to '-M' option.
* initscript/systemtap.in (stap_getopt): Ditto.
* testsuite/parseko/cmdline01.stp: Removed merge option test.
* testsuite/parseko/cmdline05.stp: Ditto.
Diffstat (limited to 'hash.cxx')
| -rw-r--r-- | hash.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -168,7 +168,6 @@ find_script_hash (systemtap_session& s, const string& script, const hash &base) // Hash user-specified arguments (that change the generated module). h.add(s.bulk_mode); // '-b' - h.add(s.merge); // '-M' h.add(s.timing); // '-t' h.add(s.prologue_searching); // '-P' h.add(s.ignore_vmlinux); // --ignore-vmlinux |