Mostly Nathan's last round of changes, but we're starting to see some
merge conflicts between PCP 3.0 and PCP 4.0 ... nothing serious, just
mildly annoying at this stage.
Changes committed to git://oss.sgi.com/kenj/pcp.git pcp4
(note this is the pcp4 branch)
CHANGELOG | 5 +++++
VERSION.pcp | 2 +-
build/rpm/pcp.spec.in | 3 +++
debian/GNUmakefile | 2 +-
debian/changelog | 6 ++++--
debian/control | 2 +-
debian/pcp.lintian | 2 +-
debian/rules | 4 +++-
debian/shlibs.local | 1 -
man/man3/pmfetch.3 | 4 ++--
man/man3/pmgetchildren.3 | 2 +-
man/man3/pmgetindom.3 | 4 ++--
man/man3/pmlookupdesc.3 | 4 ++--
man/man3/pmlookupindom.3 | 4 ++--
man/man3/pmlookupindomtext.3 | 4 ++--
man/man3/pmlookupname.3 | 4 ++--
man/man3/pmlookuptext.3 | 4 ++--
man/man3/pmloop.3 | 2 +-
man/man3/pmnameall.3 | 4 ++--
man/man3/pmnameid.3 | 4 ++--
man/man3/pmnameindom.3 | 6 +++---
man/man3/pmstore.3 | 4 ++--
man/man3/pmtraversepmns.3 | 4 ++--
src/pmdas/logger/event.h | 4 ++++
src/pmie/pmie_daily.sh | 2 +-
src/pmlock/pmlock.c | 2 +-
26 files changed, 52 insertions(+), 37 deletions(-)
commit 9bb62d7004ebbcb38816cba5a059439f83b6362f
Merge: 11e0420 d220b9a
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Jul 11 17:16:22 2011 +1000
Merge branch 'dev' into pcp4
Conflicts:
VERSION.pcp
debian/changelog
man/man3/pmfetch.3
man/man3/pmgetchildren.3
man/man3/pmgetindom.3
man/man3/pmlookupdesc.3
man/man3/pmlookupindom.3
man/man3/pmlookupindomtext.3
man/man3/pmlookupname.3
man/man3/pmlookuptext.3
man/man3/pmloop.3
man/man3/pmnameall.3
man/man3/pmnameid.3
man/man3/pmnameindom.3
man/man3/pmstore.3
man/man3/pmtraversepmns.3
Merged up my 4.0 changes for VERSION.pcp and debian/changelog.
The man page changes were all Nathan's lintian-driven corrections,
unfortunately some of these fell in block of text I removed when
the async api routines were expunged ... redo the removal.
commit d220b9a64a57f6b8f541296ec23fb3f33862aeef
Merge: 84f5b65 bd4373c
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Jul 11 16:56:25 2011 +1000
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
commit bd4373ce49dc8118c50390b1ef052c28addf3322
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jul 11 12:11:18 2011 +1000
Update spec file too for following release.
commit 693da106e9e78099a2c355c145a5f8e18b43c9ef
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jul 11 12:11:06 2011 +1000
Resolve several issues reported by newer lintian version.
Debian packaging updates - no longer need shlibs.local, no
slash at the front of the conffiles exception, updated the
standards version, added some new rules file targets.
commit d3a42408273388d331822178cc540d8fe7721b6a
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jul 11 12:06:32 2011 +1000
Fix build on RHEL4, which has an old/moldy queue.h without TAILQ_NEXT.
commit e74ad0d240479c8173d47211bd61867911f3cee7
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jul 11 12:05:51 2011 +1000
Fix man page typo reported by lintian (explict).
commit 866acfa65ac98c4e5e4762aaa439a011f4ae3cc5
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jul 11 12:03:46 2011 +1000
Whack-a-mole with /bin/pwd continues in pmie_daily.
commit a257b3607e21b3d647c747e93b735f19a1a3ba41
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jul 11 12:03:06 2011 +1000
Fix typo reported by lintian in pmlock command error message.
|