[pcp/el6: 2/2] Merge branch 'master' into el6

[nathans]

commit b3fc753c493292b1687d06077f9e31d71b4ca50e
Merge: ffa7799 72b0770
Author: Nathan Scott <nathans at redhat.com>
Date:   Thu Mar 20 09:42:58 2014 +1100

    Merge branch 'master' into el6

 .gitignore |    1 +
 pcp.spec   |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc pcp.spec
index 6b371ba,c798dc1..90a0d8d
--- a/pcp.spec
+++ b/pcp.spec
@@@ -722,8 -718,10 +722,14 @@@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild
  %defattr(-,root,root)
  
  %changelog
++=======
+ * Wed Mar 19 2014 Nathan Scott <nathans at redhat.com> - 3.9.1-1
+ - Update to latest PCP sources.
+ 
 +* Thu Feb 20 2014 Nathan Scott <nathans at redhat.com> - 3.9.0-2
 +- Workaround further PowerPC/tapset-related build fallout.
++
+ * Wed Feb 19 2014 Nathan Scott <nathans at redhat.com> - 3.9.0-1
  - Create new sub-packages for pcp-webapi and pcp-manager
  - Split configuration from pcp-libs into pcp-conf (multilib)
  - Fix pmdagluster to handle more volumes, fileops (BZ 1066544)