[qpid-cpp/epel7: 14/14] Merge branch 'master' into epel7

[Darryl L. Pierce]

commit ab0760a20cad4f2fed513d6fc6f2ae4dc0023e91
Merge: 8fe3e34 801bcbb
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Thu May 8 07:53:10 2014 -0400

    Merge branch 'master' into epel7
    
    Conflicts:
    	qpid-cpp.spec

 ...JIRA-qpidd.service-file-for-use-on-Fedora.patch |    6 +-
 ...ix-for-recovery-ambiguity-issue-other-cod.patch |    6 +-
 ...rovide-the-right-Perl-packages-in-top-lev.patch |    6 +-
 ...ix-Ruby-Perl-bindings-when-built-with-Wer.patch |    6 +-
 ...pdated-Ruby-bindings-to-build-under-CMake.patch |   61 +++
 0006-QPID-5718-Dead-code-in-the-HA-codebase.patch  |   42 ++
 0007-NO-JIRA-Remove-dead-code.patch                |   52 +++
 ...-NO-JIRA-Bumped-max-Proton-version-to-0.7.patch |   25 ++
 ...D-4582-Get-legacystore-unit-tests-working.patch |  408 ++++++++++++++++++++
 ...ixed-unit-legacystore-unit-test-to-remove.patch |   29 ++
 09-QPID-5129-Alignment-issues-on-ARM.patch         |   74 ++++
 qpid-cpp.spec                                      |   49 ++--
 12 files changed, 728 insertions(+), 36 deletions(-)
---