[Debian-ha-commits] [ocfs2-tools] 04/08: Merge tag 'upstream/1.8.5'

[Valentin Vidic]

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

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

commit b250f1686b6d651fb297a65c86588f06d6646db7
Merge: 6f64595 bf928cf
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Tue Jun 20 09:28:24 2017 +0200

    Merge tag 'upstream/1.8.5'
    
    Upstream version 1.8.5

 configure.in                              |   4 +-
 debugfs.ocfs2/commands.c                  |  29 ++++--
 debugfs.ocfs2/dump.c                      |   6 +-
 debugfs.ocfs2/main.c                      |   2 +-
 extras/find_dup_extents.c                 |   5 +-
 extras/find_hardlinks.c                   |   7 +-
 extras/resize_slotmap.c                   |  12 +--
 fsck.ocfs2/fsck.c                         | 166 ++++++++++++++++++++----------
 fsck.ocfs2/icount.c                       |   2 +-
 fsck.ocfs2/journal.c                      |   9 +-
 fsck.ocfs2/pass0.c                        |   7 +-
 fsck.ocfs2/pass1.c                        |   8 +-
 fsck.ocfs2/pass1b.c                       |   6 +-
 fsck.ocfs2/pass4.c                        |   9 ++
 fsck.ocfs2/xattr.c                        |   2 +-
 fswreck/chain.c                           |   8 +-
 fswreck/corrupt.c                         |   6 ++
 fswreck/extent.c                          |   8 +-
 fswreck/group.c                           |   8 +-
 fswreck/include/fsck_type.h               |   4 +-
 fswreck/inode.c                           |  31 ++++--
 fswreck/main.c                            |   4 +
 fswreck/symlink.c                         |   2 +-
 include/ocfs2-kernel/ocfs2_fs.h           |  16 ++-
 include/ocfs2/ocfs2.h                     |  13 ++-
 include/tools-internal/scandisk.h         |   2 +
 libo2cb/o2cb_abi.c                        |  11 +-
 libo2dlm/o2dlm.c                          |   5 +-
 libocfs2/alloc.c                          |   3 +-
 libocfs2/bitmap.c                         |  20 ++--
 libocfs2/blocktype.c                      |   2 +
 libocfs2/cached_inode.c                   |   4 +-
 libocfs2/chainalloc.c                     |   4 +-
 libocfs2/extend_file.c                    |   5 +-
 libocfs2/feature_string.c                 |  27 +++--
 libocfs2/image.c                          |  11 +-
 libocfs2/inode.c                          |  40 +++++++
 libocfs2/kernel-rbtree.c                  |   2 +
 libocfs2/lockid.c                         |   9 +-
 libocfs2/memory.c                         |   2 +-
 libocfs2/refcount.c                       |  55 +++++++++-
 libocfs2/truncate.c                       |  23 ++++-
 libtools-internal/scandisk.c              |  63 +++++++++++-
 mkfs.ocfs2/mkfs.c                         | 112 ++++++++++++++++++--
 mkfs.ocfs2/mkfs.ocfs2.8.in                |   5 +-
 mount.ocfs2/mount.ocfs2.8.in              |   9 +-
 mount.ocfs2/mount.ocfs2.c                 |  13 ++-
 mount.ocfs2/sundries.c                    |  10 +-
 mounted.ocfs2/mounted.c                   |   5 +-
 o2cb_ctl/jconfig.c                        |  18 +++-
 o2cb_ctl/o2cb_config.c                    |  10 +-
 o2cb_ctl/o2cb_ctl.c                       |  41 ++++++--
 o2cb_ctl/o2cb_scandisk.c                  |  17 ++-
 o2image/o2image.c                         |   7 +-
 o2info/o2info.c                           |   3 +-
 ocfs2_hb_ctl/ocfs2_hb_ctl.c               |  16 ++-
 tunefs.ocfs2/Makefile                     |   3 +-
 tunefs.ocfs2/feature_append_dio.c         | 123 ++++++++++++++++++++++
 tunefs.ocfs2/feature_metaecc.c            |   6 +-
 tunefs.ocfs2/libocfs2ne.c                 |   4 +-
 tunefs.ocfs2/ocfs2ne.c                    |   2 +
 tunefs.ocfs2/op_features.c                |   2 +
 tunefs.ocfs2/op_query.c                   |   3 +-
 tunefs.ocfs2/op_resize_volume.c           |   6 +-
 vendor/Makefile                           |   2 +-
 vendor/common/51-ocfs2.rules              |   3 +-
 vendor/common/Makefile                    |   4 +-
 vendor/common/Vendor.make                 |   3 +
 vendor/common/o2cb.init.sh                |  54 ++++++++--
 vendor/common/o2cb.service                |  13 +++
 vendor/common/ocfs2-tools.spec-generic.in |  62 ++++++++---
 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 +
 84 files changed, 1112 insertions(+), 240 deletions(-)

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