~ubuntu-branches/ubuntu/trusty/pacemaker/trusty-proposed

Viewing all changes in revision 24.

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-05-25 21:28:53 UTC
  • mfrom: (1.1.7 upstream) (2.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110525212853-bwsguurde787erfi
Tags: 1.0.11-1ubuntu1
* Merge from debian unstable (LP: #784855).  Remaining changes:
  - debian/patches:
    + lib_license_headers_update.patch: Update the License Headers to
      correctly reflect the use of LGPL-2.1+.
    + other_license_headers_update.patch: Update the License Headers of
      files that show GPL version 2.1, to correctly show version 2+.
    + raexecupstart.patch: Utilize new upstart LRM plugin.
    + fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes.
    + fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA.
  - debian/pacemaker.postinst: Fix permissions on /var/lib/pengine.
  - debian/control: Bump cluster-glue dependencies to Ubuntu specific.
* debian/patches: Refresh all patches.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: