| To: | pcp@xxxxxxxxxxx |
|---|---|
| Subject: | pcp updates - merge and reconcile conflicts |
| From: | kenj@xxxxxxxxxxx (Ken McDonell) |
| Date: | Fri, 25 Apr 2014 14:42:27 +1000 (EST) |
| Delivered-to: | pcp@xxxxxxxxxxx |
Changes committed to git://oss.sgi.com/kenj/pcp.git dev
qa/492.out.2 | 128 ---------------
src/pmlogrewrite/pmlogrewrite.c | 127 +++++++-------
...
commit e16b3fb7e3e91ea133da0dba31d1f122831b1cac
Merge: 4f987b5 8da53d2
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Fri Apr 25 14:39:01 2014 +1000
Merge branch 'dev' of git://git.performancecopilot.org/pcp into dev
Conflicts:
qa/492.out.2
src/pmlogrewrite/pmlogrewrite.c
Drop 492.out.2
Reconcile Ken's and Nathan's overlapping printf changes for
logrewrite.c.
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | pcp updates - repair ABI breakage and QA, Ken McDonell |
|---|---|
| Next by Date: | RE: [pcp] pcp updates: log tools longopts, pmdacisco, Ken McDonell |
| Previous by Thread: | pcp updates - repair ABI breakage and QA, Ken McDonell |
| Next by Thread: | pcp updates - pmlogger I/O all unbuffered now, Ken McDonell |
| Indexes: | [Date] [Thread] [Top] [All Lists] |