Merge branch 'master' into el5

2014-01-29 14:56:46 +11:00 · 2014-01-29 14:56:46 +11:00 · afe4c05ccb
commit afe4c05ccb
parent a6342b0e50 3eada05741
3 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -24,3 +24,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.8.9.src.tar.gz
 /pcp-3.8.10.src.tar.gz
 /pcp-3.8.11.src.tar.gz
+/pcp-3.8.12.src.tar.gz
--- a/pcp.spec
+++ b/pcp.spec
@ -1,6 +1,6 @@
 Summary: System-level performance monitoring and performance management
 Name: pcp
-Version: 3.8.11
+Version: 3.8.12
 %define buildversion 1

 Release: %{buildversion}%{?dist}
@ -617,7 +617,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
 %defattr(-,root,root)

 %changelog
-* Wed Jan 29 2014 Nathan Scott <nathans@redhat.com> - 3.8.11-1
+* Wed Jan 29 2014 Nathan Scott <nathans@redhat.com> - 3.8.12-1
 - Resolves SNMP procfs file ICMP line parse issue (BZ 1055818)
 - Update to latest PCP sources.

--- a/2
+++ b/2
@ -1 +1 @@
-21bf1b7a6352d54a5426710773ad6b5a  pcp-3.8.11.src.tar.gz
+36cce7354c2aa3439de1f6a97f3cf590  pcp-3.8.12.src.tar.gz