pcp

Merge v2.9.1 from branch 'master' of git://oss.sgi.com/pcp/pcp into dev

Conflicts resolved:
VERSION.pcp
- bump to 3.0.0-5
CHANGELOG
- merge changelog for 3.0.0 after 2.9.1
src/pmcd/rc_pcp
src/pmie/rc_pmie
src/pmproxy/rc_pmproxy
- services are chkconfig "off" by default in 3.0.0

Clean Merged:
modified: build/GNUmakefile
new file: build/sun/GNUmakefile
modified: configure.in
modified: debian/changelog
modified: debian/control
modified: src/cpan/MMV/Changes
modified: src/cpan/MMV/MMV.pm
modified: src/cpan/MMV/MMV.xs
modified: src/cpan/MMV/server.pl
modified: src/cpan/PMDA/Changes
modified: src/cpan/PMDA/PMDA.pm
modified: src/cpan/PMDA/PMDA.xs
modified: src/include/builddefs.in
modified: src/include/mmv_stats.h
modified: src/libpcp/src/.gitignore
modified: src/libpcp_gui/src/.gitignore
modified: src/libpcp_mmv/src/.gitignore
modified: src/libpcp_mmv/src/mmv_stats.c
modified: src/libpcp_pmcd/src/.gitignore
modified: src/libpcp_pmda/src/.gitignore
modified: src/libpcp_trace/src/.gitignore
modified: src/pmcd/pmdaproc.sh
modified: src/pmdas/GNUmakefile
modified: src/pmdas/mmv/.gitignore
modified: src/pmdas/mmv/GNUmakefile
modified: src/pmdas/mmv/Install
modified: src/pmdas/mmv/Remove
modified: src/pmdas/mmv/mmv.c
new file: src/pmdas/samba/.gitignore
new file: src/pmdas/samba/GNUmakefile
new file: src/pmdas/samba/Install
new file: src/pmdas/samba/Remove
new file: src/pmdas/samba/pmdasamba.pl
modified: src/pmdas/simple/pmdasimple.pl
modified: src/pmdas/solaris/GNUmakefile
modified: src/pmdas/solaris/common.h
modified: src/pmdas/solaris/data.c
modified: src/pmdas/solaris/help
new file: src/pmdas/solaris/netmib2.c
new file: src/pmdas/solaris/netmib2.h
modified: src/pmdas/solaris/pmns.network
new file: src/pmdas/solaris/pmns.zfs
new file: src/pmdas/solaris/pmns.zpool
modified: src/pmdas/solaris/root
modified: src/pmdas/solaris/solaris.c
new file: src/pmdas/solaris/zfs.c
new file: src/pmdas/solaris/zpool.c
modified: src/pmdas/windows/fetch.c
modified: src/pmdas/windows/libpdh.def
modified: src/pmdas/windows/libpdh.h
modified: src/pmdas/windows/open.c
modified: src/pmdas/windows/pmda.c
modified: src/pmdas/windows/pmns.kernel
modified: src/pmval/pmval.c

Signed-off-by: Mark Goodwin mgoodwin@redhat.com