Changeset 9e429e8 for README

Timestamp:

09/19/14 15:40:01 (7 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

11cf9b1

Parents:

d994324 (diff), ea602cd (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 remote-tracking branch 'upsteam/master' into develop

Conflicts:

README
lib/format_dpdk.c
lib/format_linux.c
lib/trace.c

File:

• README (modified) (4 diffs)

README

@@ -4 +4 @@
 Libtrace functions might not function correctly breaking the supplied tools.
 
-libtrace 3.0.20
+libtrace 3.0.21
 
 ---------------------------------------------------------------------------
@@ -14 +14 @@
 ---------------------------------------------------------------------------
 
+See INSTALL for instructions on how to install libtrace.
 
 This directory contains source code for libtrace, a userspace library for 
@@ -25 +26 @@
 Further information about libtrace see 
 http://research.wand.net.nz/software/libtrace.php
-Bugs should be reported in trac at http://www.wand.net.nz/trac/libtrace
+
+Bugs should be reported by either emailing contact@wand.net.nz or filing
+an issue at https://github.com/wanduow/libtrace
 
 It is licensed under the GNU General Public License (GPL) version 2. Please
@@ -31 +34 @@
 
 A detailed ChangeLog can be found on the libtrace wiki: 
-https://secure.wand.net.nz/trac/libtrace/wiki/ChangeLog
+https://github.com/wanduow/libtrace/wiki/ChangeLog
 
 Documentation, usage instructions and a detailed tutorial can also found