[mesos: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mesos

[tstclair]

commit 43ee8781eaf3ac92067e6dd450a95f7e7649a23d
Merge: b167905 4431ffb
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Tue May 27 10:53:29 2014 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mesos
    
    Conflicts:
    	mesos.spec

 mesos.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc mesos.spec
index 34d9388,2df06e3..faa7b51
--- a/mesos.spec
+++ b/mesos.spec
@@@ -7,7 -7,7 +7,7 @@@
  
  Name:          mesos
  Version:       0.18.2
--Release:       2.%{shortcommit}%{?dist}
++Release:       3.%{shortcommit}%{?dist}
  Summary:       Cluster manager for sharing distributed application frameworks
  License:       ASL 2.0
  URL:           http://mesos.apache.org/
@@@ -264,9 -262,9 +264,12 @@@ exit 
  /sbin/ldconfig
  
  %changelog
- * Tue May 27 2014 Timothy St. Clair <tstclair at redhat.com> - 0.18.2-2.453b973
++* Tue May 27 2014 Timothy St. Clair <tstclair at redhat.com> - 0.18.2-3.453b973
 +- Fixes for systemd
 +
+ * Fri May 23 2014 Petr Machata <pmachata at redhat.com> - 0.18.2-2.453b973
+ - Rebuild for boost 1.55.0
+ 
  * Wed May 14 2014 Timothy St. Clair <tstclair at redhat.com> - 0.18.2-1.453b973
  - Rebase to latest 0.18.2-rc1