[acassen/keepalived] d2901e: Use nodename as default id for conditional configu...

pqarmitage <[email protected]> Wed, 04 Oct 2017 06:11:59 -0700
Newsgroups gmane.linux.keepalived.devel
Message-ID <59d4de1fabcad_af13f83924ddc30642ca@hookshot-fe1-cp1-prd.iad.github.net.mail>
  Branch: refs/heads/master
  Home:   https://github.com/acassen/keepalived
  Commit: d2901e490a1616cb5f659ecf6659216a254bbf73
      https://github.com/acassen/keepalived/commit/d2901e490a1616cb5f659ecf6659216a254bbf73
  Author: Quentin Armitage <[email protected]>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS
    M keepalived/core/main.c

  Log Message:
  -----------
  Use nodename as default id for conditional configuration

If the node name returned by uname() is host123.abc.de, then
lines in the configuration file matching @host123 will match the
conditional configuration test. This means that it is no longer
necessary to specify the -i command line option if the conditional
configuration string used in the configuration is the node name.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 7621f366bc303ea65fcaabea1f085384903e1ea0
      https://github.com/acassen/keepalived/commit/7621f366bc303ea65fcaabea1f085384903e1ea0
  Author: Quentin Armitage <[email protected]>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M keepalived/core/main.c

  Log Message:
  -----------
  Option --i/--config-id parameter is not optional

Since the config-id defaults to the hostname, there is no point
in allowing --config-id to be used without a parameter, just to mean
use the hostname.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: d784428059112d0a9bc1fc2f74a3bef3537c4095
      https://github.com/acassen/keepalived/commit/d784428059112d0a9bc1fc2f74a3bef3537c4095
  Author: Quentin Armitage <[email protected]>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M keepalived/core/main.c

  Log Message:
  -----------
  Use NULL instead of 0 for pointers in get_longopts struct

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: d010ebddd79b78f660789e0fa1b6dc232f252c9c
      https://github.com/acassen/keepalived/commit/d010ebddd79b78f660789e0fa1b6dc232f252c9c
  Author: Quentin Armitage <[email protected]>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M ChangeLog
    M INSTALL
    M configure
    M configure.ac
    M keepalived/core/main.c
    A keepalived/include/vrrp_json.h
    M keepalived/vrrp/Makefile.am
    M keepalived/vrrp/vrrp_daemon.c
    A keepalived/vrrp/vrrp_json.c
    M lib/config.h.in
    M lib/signals.c
    M lib/timer.h

  Log Message:
  -----------
  Merge branch 'master' into fixes


  Commit: 1bd9b12362d48dafc30bfa8b4af88330c7d69346
      https://github.com/acassen/keepalived/commit/1bd9b12362d48dafc30bfa8b4af88330c7d69346
  Author: Quentin Armitage <[email protected]>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived/include/vrrp_json.h
    M keepalived/vrrp/Makefile.in
    M keepalived/vrrp/vrrp_json.c
    M lib/config.h.in
    M lib/signals.c

  Log Message:
  -----------
  Some minor tidying up of the new JSON output code

1. Use SIGRTMIN+2 rather than (_SIGRTMIN + 4)
2. Don't include JSON code if not building with VRRP
3. Some code alignment fixes
4. Some conditional compilation additions

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: bbc2984a3bf140986f984b8057124e90963ad39f
      https://github.com/acassen/keepalived/commit/bbc2984a3bf140986f984b8057124e90963ad39f
  Author: Quentin Armitage <[email protected]>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M doc/man/man8/keepalived.8
    M keepalived/core/main.c
    M lib/signals.c
    M lib/signals.h

  Log Message:
  -----------
  Add --signum command line option to report signal numbers

Since keepalived is starting to use real time signals, and those
signal numbers are not fixes, this commit introduces a way to
ask keepalived to report those signal numbers.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 4413b83a7b5c28944c908ab6c737e06c6bc01288
      https://github.com/acassen/keepalived/commit/4413b83a7b5c28944c908ab6c737e06c6bc01288
  Author: pqarmitage <[email protected]>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M configure
    M configure.ac
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M doc/man/man8/keepalived.8
    M keepalived/core/main.c
    M keepalived/include/vrrp_json.h
    M keepalived/vrrp/Makefile.in
    M keepalived/vrrp/vrrp_json.c
    M lib/config.h.in
    M lib/signals.c
    M lib/signals.h

  Log Message:
  -----------
  Merge pull request #660 from pqarmitage/fixes

Some updates for the main JSON patch


Compare: https://github.com/acassen/keepalived/compare/2e7d726a30a6...4413b83a7b5c

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

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