Ignore:
Timestamp:
07/07/14 14:25:36 (7 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
262a093, ce7153d, ea602cd
Parents:
1ca603b (diff), 17f954f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/tracesplit/tracesplit.c

    r755855a r17f954f  
    316316        } else if (strncmp(compress_type_str, "lzo", 3) == 0) {
    317317                compress_type = TRACE_OPTION_COMPRESSTYPE_LZO;
     318        } else if (strncmp(compress_type_str, "xz", 2) == 0) {
     319                compress_type = TRACE_OPTION_COMPRESSTYPE_LZMA;
    318320        } else if (strncmp(compress_type_str, "no", 2) == 0) {
    319321                compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;
Note: See TracChangeset for help on using the changeset viewer.