pcp updates

[Nathan Scott <nathans@xxxxxxxxxx>]

Changes committed to git://oss.sgi.com/pcp/pcp.git dev

 src/pmdas/elasticsearch/pmdaelasticsearch.pl |   75 ++++++++++++++-------------
 1 file changed, 39 insertions(+), 36 deletions(-)

commit 487fd92b6663af48c0ae34bf082bf6a50f76e223
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Fri Jun 15 13:12:51 2012 +1000

    Remove unused pmdaelasticsearch function, minor tidyup

commit f5d574817dff0c3daa122065c6ee4fd34e884c3d
Merge: 1104ab8 f0d5d27
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Fri Jun 15 13:09:08 2012 +1000

    Merge branch 'dev' of /source/git/nigel into dev

commit f0d5d279cbeae9281908272d33d0bd01f2e3f401
Author: Nigel Donaldson <ndonaldson@xxxxxxxxxx>
Date:   Fri Jun 15 12:55:12 2012 +1000

    Now reports metrics for only non-data nodes. KAT-735