[Debian-ha-commits] [ocfs2-tools] 42/58: Merge pull request #7 from biger410/master

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch upstream
in repository ocfs2-tools.

commit 4796013fc7bc6016264a6003c254038521703ead
Merge: 89a53e3 8568da8
Author: Junxiao Bi <junxiao.bi at oracle.com>
Date:   Fri Oct 21 15:12:53 2016 +0800

    Merge pull request #7 from biger410/master
    
    queued patch from Oracle

 fsck.ocfs2/journal.c                      |  1 +
 include/ocfs2-kernel/ocfs2_fs.h           |  2 +
 include/ocfs2/ocfs2.h                     |  2 +
 include/tools-internal/scandisk.h         |  2 +
 libocfs2/refcount.c                       | 51 +++++++++++++++++++++++
 libocfs2/truncate.c                       | 11 ++++-
 libtools-internal/scandisk.c              | 57 ++++++++++++++++++++++++++
 mkfs.ocfs2/mkfs.c                         | 51 +++++++++++++++++++++--
 mounted.ocfs2/mounted.c                   |  5 ++-
 o2cb_ctl/o2cb_scandisk.c                  |  2 +
 vendor/Makefile                           |  2 +-
 vendor/common/Makefile                    |  4 +-
 vendor/common/Vendor.make                 |  3 ++
 vendor/common/o2cb.init.sh                |  1 +
 vendor/common/o2cb.service                | 14 +++++++
 vendor/common/ocfs2-tools.spec-generic.in | 59 +++++++++++++++++++++------
 vendor/common/ocfs2.service               | 14 +++++++
 vendor/fc7/Vendor.make                    |  2 +
 vendor/fc8/Vendor.make                    |  2 +
 vendor/fc9/Vendor.make                    |  2 +
 vendor/rhel4/Vendor.make                  |  2 +
 vendor/rhel5/Vendor.make                  |  2 +
 vendor/rhel6/Vendor.make                  |  2 +
 vendor/rhel7/Makefile                     | 10 +++++
 vendor/rhel7/Vendor.make                  | 13 ++++++
 vendor/rhel7/rpmarch.guess                | 68 +++++++++++++++++++++++++++++++
 vendor/rhel7/vendor.guess                 | 13 ++++++
 vendor/sles10/Vendor.make                 |  2 +
 vendor/sles9/Vendor.make                  |  2 +
 29 files changed, 378 insertions(+), 23 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git