[acassen/keepalived] fe775c: Fix use of init_state after a reload
pqarmitage <[email protected]> Mon, 18 Dec 2017 16:45:11 -0800
| Newsgroups | gmane.linux.keepalived.devel |
|---|---|
| Message-ID | <5a386117b22fb_61e2ac630d31c0813842@hookshot-fe-6e9b612.cp1-iad.github.net.mail> |
Branch: refs/heads/beta
Home: https://github.com/acassen/keepalived
Commit: fe775ce1dc526e7ab8d97da72d64ca9b4a78311e
https://github.com/acassen/keepalived/commit/fe775ce1dc526e7ab8d97da72d64ca9b4a78311e
Author: Quentin Armitage <[email protected]>
Date: 2017-12-16 (Sat, 16 Dec 2017)
Changed paths:
M keepalived/vrrp/vrrp_scheduler.c
Log Message:
-----------
Fix use of init_state after a reload
Issue #627 identified that vrrp->init_state was being incorrectly
used in vrrp_fault(), since it is modified at a reload.
Instead of using init_state, we now use the configured priority
of the vrrp instance, so if the vrrp instance is the address owner
(priority 255) it will transition to master after leaving to fault
state, otherwise it transitions to backup.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: e0fc908b11c757887b0d399a5280099a302b8b28
https://github.com/acassen/keepalived/commit/e0fc908b11c757887b0d399a5280099a302b8b28
Author: Quentin Armitage <[email protected]>
Date: 2017-12-16 (Sat, 16 Dec 2017)
Changed paths:
M keepalived/include/vrrp.h
M keepalived/vrrp/vrrp.c
M keepalived/vrrp/vrrp_data.c
M keepalived/vrrp/vrrp_json.c
M keepalived/vrrp/vrrp_parser.c
M keepalived/vrrp/vrrp_print.c
Log Message:
-----------
Remove init_state from vrrp structure
init_state is no longer used, so remove it from the vrrp structure.
Since it has been included in keepalived SNMP, it is preserved
solely for reporting in SNMP requests.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: f37bc124919fa8ef9035e47718e71f10b2fda3ab
https://github.com/acassen/keepalived/commit/f37bc124919fa8ef9035e47718e71f10b2fda3ab
Author: Quentin Armitage <[email protected]>
Date: 2017-12-16 (Sat, 16 Dec 2017)
Changed paths:
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M keepalived/include/vrrp.h
M keepalived/include/vrrp_snmp.h
M keepalived/vrrp/vrrp.c
M keepalived/vrrp/vrrp_parser.c
M keepalived/vrrp/vrrp_scheduler.c
M keepalived/vrrp/vrrp_snmp.c
M keepalived/vrrp/vrrp_sync.c
Log Message:
-----------
Change conditional compilation _WITH_SNMP_KEEPALIVED_ to _WITH_SNMP_VRRP_
The functionality that the conditional compilation enabled was snmp vrrp
functionality, so make the name more relevant.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: abe113e5b1f155580b58fb2bdd760dc924fc5382
https://github.com/acassen/keepalived/commit/abe113e5b1f155580b58fb2bdd760dc924fc5382
Author: pqarmitage <[email protected]>
Date: 2017-12-16 (Sat, 16 Dec 2017)
Changed paths:
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M keepalived/include/vrrp.h
M keepalived/include/vrrp_snmp.h
M keepalived/vrrp/vrrp.c
M keepalived/vrrp/vrrp_data.c
M keepalived/vrrp/vrrp_json.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_sync.c
Log Message:
-----------
Merge pull request #721 from pqarmitage/fixes
Resolve inconsistent use of vrrp->init_state
Commit: ed891ebd34da7b0df9fcc535814fac4544fdf6b9
https://github.com/acassen/keepalived/commit/ed891ebd34da7b0df9fcc535814fac4544fdf6b9
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M configure
M configure.ac
M lib/config.h.in
Log Message:
-----------
Finalise change from _WITH_SNMP_KEEPALIVED_ to _WITH_SNMP_VRRP_
Commit f37bc124 omitted to update configure.ac
Signed-off-by: Quentin Armitage <[email protected]>
Commit: e943406a86dc10606fc2289268a8534cd6a5b7b5
https://github.com/acassen/keepalived/commit/e943406a86dc10606fc2289268a8534cd6a5b7b5
Author: pqarmitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M configure
M configure.ac
M lib/config.h.in
Log Message:
-----------
Merge pull request #722 from pqarmitage/fixes
Finalise change from _WITH_SNMP_KEEPALIVED_ to _WITH_SNMP_VRRP_
Commit: f22f0baef7f0d801d60b895584d8815a6243ca33
https://github.com/acassen/keepalived/commit/f22f0baef7f0d801d60b895584d8815a6243ca33
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M configure
M configure.ac
Log Message:
-----------
Update error message in configure.ac
Signed-off-by: Quentin Armitage <[email protected]>
Commit: e06405efa95b8d0c35623e8e6497eaa2604ad957
https://github.com/acassen/keepalived/commit/e06405efa95b8d0c35623e8e6497eaa2604ad957
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M configure
M configure.ac
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M keepalived/include/vrrp.h
M keepalived/include/vrrp_snmp.h
M keepalived/vrrp/vrrp.c
M keepalived/vrrp/vrrp_data.c
M keepalived/vrrp/vrrp_json.c
M keepalived/vrrp/vrrp_parser.c
M keepalived/vrrp/vrrp_scheduler.c
M keepalived/vrrp/vrrp_snmp.c
M lib/config.h.in
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: 3735aec6248fe41f38422516372c05615f1a6121
https://github.com/acassen/keepalived/commit/3735aec6248fe41f38422516372c05615f1a6121
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M keepalived/vrrp/vrrp_scheduler.c
M keepalived/vrrp/vrrp_sync.c
Log Message:
-----------
Fix merge of commit e0fc908b
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 3c7edeb9b6b3180fb23ce25c124216b1ee1b7657
https://github.com/acassen/keepalived/commit/3c7edeb9b6b3180fb23ce25c124216b1ee1b7657
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Add more configure options to Travis build matrix
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 68610982ffa46c1056e744e89fe5a0eca52ecf0a
https://github.com/acassen/keepalived/commit/68610982ffa46c1056e744e89fe5a0eca52ecf0a
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: afad2f181ce5f408947a49c6017b99413b966e64
https://github.com/acassen/keepalived/commit/afad2f181ce5f408947a49c6017b99413b966e64
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M INSTALL
M test/ci/setup.sh
Log Message:
-----------
Install additional libraries in Travis environment for new options
Signed-off-by: Quentin Armitage <[email protected]>
Commit: b6ddf31ea2e823cbc38e4b1ba5db131f830c023a
https://github.com/acassen/keepalived/commit/b6ddf31ea2e823cbc38e4b1ba5db131f830c023a
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
M keepalived/check/check_smtp.c
Log Message:
-----------
Fix some problem found by Travis-ci
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 8e2719179df86141c5d198757cfe9252e0be67f7
https://github.com/acassen/keepalived/commit/8e2719179df86141c5d198757cfe9252e0be67f7
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
M INSTALL
M keepalived/check/check_smtp.c
M test/ci/setup.sh
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: d71ecec66e2df020142de7c8e0116de7febf6706
https://github.com/acassen/keepalived/commit/d71ecec66e2df020142de7c8e0116de7febf6706
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M configure
M configure.ac
Log Message:
-----------
Fix configure --disable-checksum-compat option
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 6854a2a9b3b9a2c2edb692a2edeb4239bfbf97d4
https://github.com/acassen/keepalived/commit/6854a2a9b3b9a2c2edb692a2edeb4239bfbf97d4
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Remove DOS file formatting from .travis.yml
Signed-off-by: Quentin Armitage <[email protected]>
Commit: dab598b27cfbc02bccbfe592a3b70a691c8c4b43
https://github.com/acassen/keepalived/commit/dab598b27cfbc02bccbfe592a3b70a691c8c4b43
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
M configure
M configure.ac
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: d83df1c0caae8ad0b30296f8e73c82d3370afab6
https://github.com/acassen/keepalived/commit/d83df1c0caae8ad0b30296f8e73c82d3370afab6
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
M configure
M configure.ac
Log Message:
-----------
Add more configuration options to Travis testing
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 7ceeab13d08a289ebfc70fa0f3d02f3f9e92e3ed
https://github.com/acassen/keepalived/commit/7ceeab13d08a289ebfc70fa0f3d02f3f9e92e3ed
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
M keepalived/vrrp/vrrp_data.c
M keepalived/vrrp/vrrp_json.c
M keepalived/vrrp/vrrp_print.c
M keepalived/vrrp/vrrp_snmp.c
Log Message:
-----------
Add more configuration option to Travis builds and some build fixes
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 656c36b314e3b61701b9cc1168f25f4b07c0785a
https://github.com/acassen/keepalived/commit/656c36b314e3b61701b9cc1168f25f4b07c0785a
Author: Quentin Armitage <[email protected]>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M .travis.yml
M keepalived/core/keepalived_netlink.c
M keepalived/core/main.c
M keepalived/vrrp/vrrp_data.c
M keepalived/vrrp/vrrp_json.c
M keepalived/vrrp/vrrp_print.c
M keepalived/vrrp/vrrp_snmp.c
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: f9de0c97e6f8c55f39b01d253e20554dca4836c0
https://github.com/acassen/keepalived/commit/f9de0c97e6f8c55f39b01d253e20554dca4836c0
Author: pqarmitage <[email protected]>
Date: 2017-12-19 (Tue, 19 Dec 2017)
Changed paths:
M .travis.yml
M INSTALL
M configure
M configure.ac
M keepalived/check/check_smtp.c
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M keepalived/core/keepalived_netlink.c
M keepalived/core/main.c
M keepalived/include/vrrp.h
M keepalived/include/vrrp_snmp.h
M keepalived/vrrp/vrrp.c
M keepalived/vrrp/vrrp_data.c
M keepalived/vrrp/vrrp_json.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_sync.c
M lib/config.h.in
M test/ci/setup.sh
Log Message:
-----------
Merge pull request #724 from pqarmitage/beta
Merges of updates to Master branch
Compare: https://github.com/acassen/keepalived/compare/9c38528d7fb1...f9de0c97e6f8
------------------------------------------------------------------------------
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