[acassen/keepalived] a8fa58: Merge pull request #1 from acassen/master

  Branch: refs/heads/master
  Home:   https://github.com/acassen/keepalived
  Commit: a8fa58af639f7bcb921939bb2ec9352c7d05655d
      https://github.com/acassen/keepalived/commit/a8fa58af639f7bcb921939bb2ec9352c7d05655d
  Author: rolffokkens <[email protected]>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M .gitignore
    M ChangeLog
    M Makefile.am
    M Makefile.in
    A aclocal.m4
    A ar-lib
    M bin_install/Makefile.in
    A compile
    M configure
    M configure.ac
    A depcomp
    A doc/.gitignore
    R doc/KEEPALIVED-MIB
    A doc/KEEPALIVED-MIB.txt
    M doc/Makefile.am
    M doc/Makefile.in
    A doc/README.sphinx
    R doc/VRRP-MIB
    A doc/VRRP-MIB.txt
    R doc/VRRPv3-MIB
    A doc/VRRPv3-MIB.txt
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M doc/samples/keepalived.conf.SMTP_CHECK
    M genhash/Makefile.am
    M genhash/Makefile.in
    M genhash/http.c
    M genhash/layer4.c
    M genhash/main.c
    M genhash/ssl.c
    M keepalived.spec.in
    M keepalived/Makefile.am
    M keepalived/Makefile.in
    M keepalived/check/Makefile.am
    M keepalived/check/Makefile.in
    M keepalived/check/check_api.c
    M keepalived/check/check_daemon.c
    M keepalived/check/check_data.c
    A keepalived/check/check_dns.c
    M keepalived/check/check_http.c
    M keepalived/check/check_misc.c
    M keepalived/check/check_parser.c
    M keepalived/check/check_smtp.c
    M keepalived/check/check_snmp.c
    M keepalived/check/check_ssl.c
    M keepalived/check/check_tcp.c
    M keepalived/check/ipvswrapper.c
    M keepalived/check/ipwrapper.c
    M keepalived/check/libipvs.c
    M keepalived/core/Makefile.in
    M keepalived/core/global_data.c
    M keepalived/core/global_parser.c
    M keepalived/core/layer4.c
    M keepalived/core/main.c
    M keepalived/core/namespaces.c
    M keepalived/core/process.c
    M keepalived/core/smtp.c
    M keepalived/core/snmp.c
    A keepalived/dbus/.gitignore
    A keepalived/dbus/Makefile.am
    A keepalived/dbus/Makefile.in
    A keepalived/dbus/org.keepalived.Vrrp1.Instance.xml
    A keepalived/dbus/org.keepalived.Vrrp1.Vrrp.xml_template
    A keepalived/dbus/org.keepalived.Vrrp1.conf
    A keepalived/etc/init.d/keepalived
    R keepalived/etc/init.d/keepalived.init
    R keepalived/etc/init.d/keepalived.sysconfig
    A keepalived/etc/init/keepalived.conf
    A keepalived/etc/sysconfig/keepalived
    M keepalived/include/check_api.h
    M keepalived/include/check_data.h
    A keepalived/include/check_dns.h
    M keepalived/include/check_http.h
    M keepalived/include/check_misc.h
    M keepalived/include/check_smtp.h
    M keepalived/include/check_tcp.h
    M keepalived/include/global_data.h
    M keepalived/include/global_parser.h
    M keepalived/include/ip_vs.h
    M keepalived/include/ipvswrapper.h
    M keepalived/include/ipwrapper.h
    M keepalived/include/layer4.h
    M keepalived/include/main.h
    M keepalived/include/namespaces.h
    M keepalived/include/pidfile.h
    M keepalived/include/smtp.h
    M keepalived/include/snmp.h
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_arp.h
    M keepalived/include/vrrp_data.h
    A keepalived/include/vrrp_dbus.h
    M keepalived/include/vrrp_if.h
    M keepalived/include/vrrp_if_config.h
    M keepalived/include/vrrp_ipaddress.h
    M keepalived/include/vrrp_iproute.h
    M keepalived/include/vrrp_iprule.h
    M keepalived/include/vrrp_ipsecah.h
    M keepalived/include/vrrp_ipset.h
    M keepalived/include/vrrp_iptables.h
    M keepalived/include/vrrp_iptables_calls.h
    M keepalived/include/vrrp_ndisc.h
    M keepalived/include/vrrp_netlink.h
    M keepalived/include/vrrp_scheduler.h
    M keepalived/include/vrrp_track.h
    M keepalived/vrrp/Makefile.am
    M keepalived/vrrp/Makefile.in
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_arp.c
    M keepalived/vrrp/vrrp_daemon.c
    M keepalived/vrrp/vrrp_data.c
    A keepalived/vrrp/vrrp_dbus.c
    M keepalived/vrrp/vrrp_if.c
    M keepalived/vrrp/vrrp_if_config.c
    M keepalived/vrrp/vrrp_ip_rule_route_parser.c
    M keepalived/vrrp/vrrp_ipaddress.c
    M keepalived/vrrp/vrrp_iproute.c
    M keepalived/vrrp/vrrp_iprule.c
    M keepalived/vrrp/vrrp_ipsecah.c
    M keepalived/vrrp/vrrp_ipset.c
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M keepalived/vrrp/vrrp_ndisc.c
    M keepalived/vrrp/vrrp_netlink.c
    M keepalived/vrrp/vrrp_notify.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_print.c
    M keepalived/vrrp/vrrp_scheduler.c
    M keepalived/vrrp/vrrp_snmp.c
    M keepalived/vrrp/vrrp_track.c
    M keepalived/vrrp/vrrp_vmac.c
    M lib/Makefile.in
    M lib/bitops.h
    M lib/config.h.in
    M lib/html.c
    M lib/html.h
    M lib/list.c
    M lib/list.h
    M lib/memory.c
    M lib/memory.h
    M lib/notify.c
    M lib/notify.h
    M lib/parser.c
    M lib/parser.h
    M lib/rttables.c
    M lib/rttables.h
    M lib/scheduler.c
    M lib/scheduler.h
    M lib/signals.c
    M lib/signals.h
    M lib/timer.c
    M lib/timer.h
    M lib/utils.c
    M lib/utils.h
    M lib/vector.c
    M lib/vector.h
    A missing
    A test/netns-test.sh

  Log Message:
  -----------
  Merge pull request #1 from acassen/master

Update from original


  Commit: 1e93da0f63dbeb7a3a42d72c6724c765eb20593f
      https://github.com/acassen/keepalived/commit/1e93da0f63dbeb7a3a42d72c6724c765eb20593f
  Author: Rolf Fokkens <[email protected]>
  Date:   2016-11-26 (Sat, 26 Nov 2016)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M keepalived/include/vrrp_track.h
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_scheduler.c

  Log Message:
  -----------
  Added init_fail setting to assume failed state for vrrp_script during startup of keepalived


  Commit: c1d7c17ddd92f10d123f6b9933b4105af2a13b35
      https://github.com/acassen/keepalived/commit/c1d7c17ddd92f10d123f6b9933b4105af2a13b35
  Author: pqarmitage <[email protected]>
  Date:   2016-11-26 (Sat, 26 Nov 2016)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M keepalived/include/vrrp_track.h
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_scheduler.c

  Log Message:
  -----------
  Merge pull request #468 from TargetHolding/init_fail

Init_fail setting for vrrp_script


Compare: https://github.com/acassen/keepalived/compare/1584eb440a42...c1d7c17ddd92

------------------------------------------------------------------------------

_______________________________________________
Keepalived-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/keepalived-devel