Changeset 97d170d for tools

Timestamp:

01/15/15 13:57:47 (6 years ago)

Author:

Dan Collins <dan@…>

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:

d97778c

Parents:

4cc6e74 (diff), 21f3226 (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' of github.com:wanduow/libtrace into develop

Conflicts:

lib/format_dag25.c

File:

• tools/tracestats/tracestats.c (modified) (1 diff)

tools/tracestats/tracestats.c

@@ -157 +157 @@
 
         if (trace_is_err(trace))
-                trace_perror(trace,"%s",uri);
+                trace_perror(trace,"Processing trace");
 
         trace_destroy(trace);