[rear-devel] [rear/rear] 581749: Merge pull request #1010 from rear/master

Gratien D'haese gratien.dhaese at gmail.com
Thu Oct 13 13:31:21 CEST 2016


  Branch: refs/heads/master
  Home:   https://github.com/rear/rear
  Commit: 5817493c8a9a98f606cb23a666a53a86f4445ab7
      https://github.com/rear/rear/commit/5817493c8a9a98f606cb23a666a53a86f4445ab7
  Author: Gratien D'haese <gratien.dhaese at gmail.com>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M Makefile
    M README.adoc
    M doc/rear-release-notes.txt
    M doc/rear.8
    M doc/rear.8.adoc
    M doc/user-guide/02-getting-started.adoc
    M doc/user-guide/03-configuration.adoc
    M doc/user-guide/07-tips-and-tricks.adoc
    M packaging/debian/control
    M packaging/rpm/rear.spec
    M usr/share/rear/backup/DUPLICITY/default/50_make_duplicity_backup.sh
    M usr/share/rear/backup/RSYNC/default/45_calculate_req_space.sh
    M usr/share/rear/backup/RSYNC/default/50_make_rsync_backup.sh
    M usr/share/rear/build/SUSE_LINUX/61_link_systemd_lib.sh
    M usr/share/rear/build/default/50_patch_sshd_config.sh
    M usr/share/rear/conf/GNU/Linux.conf
    M usr/share/rear/conf/default.conf
    M usr/share/rear/conf/examples/SLE12-SP2-btrfs-example.conf
    M usr/share/rear/conf/templates/RESULT_mailbody.txt
    M usr/share/rear/layout/save/GNU/Linux/27_hpraid_layout.sh
    M usr/share/rear/layout/save/GNU/Linux/51_current_disk_usage.sh
    M usr/share/rear/layout/save/default/45_check_bootloader_files.sh
    M usr/share/rear/layout/save/default/45_check_network_files.sh
    M usr/share/rear/lib/bootloader-functions.sh
    M usr/share/rear/lib/config-functions.sh
    M usr/share/rear/lib/drlm-functions.sh
    M usr/share/rear/lib/framework-functions.sh
    M usr/share/rear/lib/linux-functions.sh
    M usr/share/rear/lib/validated/CentOS/5.5/i386.txt
    M usr/share/rear/lib/validated/CentOS/5.6/i386.txt
    M usr/share/rear/lib/validated/Fedora/14/i386.txt
    M usr/share/rear/lib/validated/Fedora/9/i386.txt
    M usr/share/rear/lib/validated/RedHatEnterpriseServer/5.6/i386.txt
    M usr/share/rear/lib/validated/RedHatEnterpriseServer/6/i386.txt
    M usr/share/rear/lib/validated/Ubuntu/10.04/i386.txt
    M usr/share/rear/output/ISO/Linux-i386/25_populate_efibootimg.sh
    M usr/share/rear/output/PXE/default/81_create_pxelinux_cfg.sh
    M usr/share/rear/output/USB/Linux-i386/10_create_efiboot.sh
    M usr/share/rear/output/default/94_grub2_rescue.sh
    M usr/share/rear/output/default/94_grub_rescue.sh
    M usr/share/rear/prep/DUPLICITY/default/05_prep_duplicity.sh
    M usr/share/rear/prep/DUPLICITY/default/20_find_duply_profile.sh
    M usr/share/rear/prep/DUPLICITY/default/22_define_backup_prog.sh
    M usr/share/rear/prep/DUPLICITY/default/25_find_all_libs.sh
    M usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh
    M usr/share/rear/prep/ISO/default/32_check_cdrom_size.sh
    M usr/share/rear/prep/NETFS/default/40_automatic_exclude_recreate.sh
    M usr/share/rear/prep/RSYNC/default/10_check_rsync.sh
    M usr/share/rear/prep/RSYNC/default/15_check_rsync_protocol_version.sh
    M usr/share/rear/prep/default/50_guess_bootloader.sh
    M usr/share/rear/rescue/GNU/Linux/30_dns.sh
    M usr/share/rear/rescue/GNU/Linux/95_cfg2html.sh
    M usr/share/rear/rescue/GNU/Linux/96_collect_MC_serviceguard_infos.sh
    M usr/share/rear/rescue/GNU/Linux/99_sysreqs.sh
    M usr/share/rear/restore/DUPLICITY/default/10_restore_duply.sh
    M usr/share/rear/restore/DUPLICITY/default/20_prompt_user_to_start_restore.sh
    M usr/share/rear/restore/DUPLICITY/default/40_restore_duplicity.sh
    M usr/share/rear/restore/default/50_selinux_autorelabel.sh
    M usr/share/rear/skel/default/etc/motd
    M usr/share/rear/verify/DUPLICITY/default/20_check_tmpfs.sh
    M usr/share/rear/verify/DUPLICITY/default/25_check_duply_profile.sh

  Log Message:
  -----------
  Merge pull request #1010 from rear/master

sync master with dev tree


  Commit: 28199db85aa784510b0a7e8649d019482dc118df
      https://github.com/rear/rear/commit/28199db85aa784510b0a7e8649d019482dc118df
  Author: Gratien D'haese <gratien.dhaese at gmail.com>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Log Message:
  -----------
  Merge pull request #1034 from rear/dev

Merge pull request #1010 from rear/master


Compare: https://github.com/rear/rear/compare/861552cc84f9...28199db85aa7


More information about the rear-devel mailing list