[ocaml-libvirt/f21: 10/10] Merge ../master into f21

[Richard W.M. Jones]

commit 6952b7366798212a26efa0fa8892d096569bbe3c
Merge: 6da9938 41bd246
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Mar 11 17:07:45 2015 +0000

    Merge ../master into f21

 0001-Add-a-binding-for-virDomainCreateXML.patch    | 213 +++++++++++++++++++++
 ...ndard-int64_t-instead-of-OCaml-defined-an.patch |  35 ++++
 ...meter-nr_pcpus-of-Libvirt.Domain.get_cpu_.patch | 116 -----------
 ocaml-libvirt.spec                                 |  37 +++-
 sources                                            |   2 +-
 5 files changed, 282 insertions(+), 121 deletions(-)
---
diff --cc ocaml-libvirt.spec
index 4a9b7e7,36b8151..6d92735
--- a/ocaml-libvirt.spec
+++ b/ocaml-libvirt.spec
@@@ -86,8 -92,31 +92,31 @@@ make install-byt
  
  
  %changelog
+ * Fri Mar  6 2015 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.4-5
+ - Add binding for virDomainCreateXML.
+ 
+ * Mon Feb 16 2015 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.4-4
+ - ocaml-4.02.1 rebuild.
+ 
+ * Sat Aug 30 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.4-3
+ - ocaml-4.02.0 final rebuild.
+ - Fix int types.
+ 
+ * Mon Aug 25 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.4-1
+ - New upstream version 0.6.1.4.
+ - Patch removed, now upstream.
+ 
+ * Sat Aug 23 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.2-14
+ - ocaml-4.02.0+rc1 rebuild.
+ 
+ * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1.2-13
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Sat Aug 02 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.2-12
+ - ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
+ 
 -* Mon Jul 21 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.2-11
 -- OCaml 4.02.0 beta rebuild.
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1.2-11
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
  
  * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1.2-10
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild