]> git.ipfire.org Git - thirdparty/kea.git/log
thirdparty/kea.git
11 years agoSet source IP address in PktFilterInet::send 2/head
Nicolas C [Fri, 26 Sep 2014 08:57:47 +0000 (10:57 +0200)] 
Set source IP address in PktFilterInet::send

Perfdhcp can be used with option -l to specify the local address to be
used.

However, when this option is used on a secondary address of an
interface, this doesn't work correctly.

The packets are sent with:
- giaddr = adresse specified (correct)
- source ip address = the interface primary IP address

Here is a patch that correctly sets the source IP address before sending
the packet.
This allows to launch multiple perfdhcp processes at the same time,
sharing the same interface but each using a distinct IP address.

11 years ago[master] version bump, mail corrected in configure.ac
Tomek Mrugalski [Thu, 25 Sep 2014 11:23:23 +0000 (13:23 +0200)] 
[master] version bump, mail corrected in configure.ac

11 years ago[master] Version bumped to 0.9-git
Tomek Mrugalski [Thu, 25 Sep 2014 11:14:03 +0000 (13:14 +0200)] 
[master] Version bumped to 0.9-git

11 years ago[master] Removed obsolete, added missing variable setup (after #3591 merge)
Tomek Mrugalski [Thu, 25 Sep 2014 10:43:47 +0000 (12:43 +0200)] 
[master] Removed obsolete, added missing variable setup (after #3591 merge)

11 years ago[master] Removed obsolete funtion
Tomek Mrugalski [Thu, 25 Sep 2014 10:42:37 +0000 (12:42 +0200)] 
[master] Removed obsolete funtion

11 years ago[master] Compilation fix after 3591 merge.
Tomek Mrugalski [Thu, 25 Sep 2014 10:42:17 +0000 (12:42 +0200)] 
[master] Compilation fix after 3591 merge.

11 years ago[master] Merge branch 'trac3591' (logging lockfile fix)
Tomek Mrugalski [Thu, 25 Sep 2014 10:41:51 +0000 (12:41 +0200)] 
[master] Merge branch 'trac3591' (logging lockfile fix)

Conflicts:
ChangeLog
Makefile.am
src/lib/dhcpsrv/daemon.cc

11 years ago[3591] Cosmetic change after review
Tomek Mrugalski [Wed, 24 Sep 2014 14:43:27 +0000 (16:43 +0200)] 
[3591] Cosmetic change after review

11 years ago[master] ChangeLog updated after trac3536 merge.
Tomek Mrugalski [Tue, 23 Sep 2014 16:36:42 +0000 (18:36 +0200)] 
[master] ChangeLog updated after trac3536 merge.

11 years agoMerge branch 'trac3536'
Tomek Mrugalski [Tue, 23 Sep 2014 16:35:17 +0000 (18:35 +0200)] 
Merge branch 'trac3536'

11 years ago[3536] Added root loggers to the Kea user guide.
Marcin Siodelski [Tue, 23 Sep 2014 14:47:14 +0000 (16:47 +0200)] 
[3536] Added root loggers to the Kea user guide.

11 years ago[3591] Changes after review:
Tomek Mrugalski [Tue, 23 Sep 2014 14:01:16 +0000 (16:01 +0200)] 
[3591] Changes after review:

 - ChangeLog updated
 - applyDefaultConfiguration() removed
 - couple unit-tests renamed
 - comments added for code that uses TEST_DATA_TOPBUILDDIR
 - copyright years updated
 - one function moved: logger_unittest_support.cc => logger_support.cc

11 years ago[3536] Fixed a few editorial nits.
Marcin Siodelski [Tue, 23 Sep 2014 13:59:10 +0000 (15:59 +0200)] 
[3536] Fixed a few editorial nits.

11 years ago[3591] Logging::applyDefaultConfiguration() removed.
Tomek Mrugalski [Tue, 23 Sep 2014 12:41:43 +0000 (14:41 +0200)] 
[3591] Logging::applyDefaultConfiguration() removed.

11 years ago[3591] Shell tests renamed.
Tomek Mrugalski [Tue, 23 Sep 2014 12:41:05 +0000 (14:41 +0200)] 
[3591] Shell tests renamed.

11 years ago[3536] Disabled ddns in keactrl.conf.in
Tomek Mrugalski [Tue, 23 Sep 2014 11:46:56 +0000 (13:46 +0200)] 
[3536] Disabled ddns in keactrl.conf.in

11 years agoMerge branch 'trac3536' of ssh://git.kea.isc.org/git/kea into trac3536
Tomek Mrugalski [Tue, 23 Sep 2014 11:23:41 +0000 (13:23 +0200)] 
Merge branch 'trac3536' of ssh://git.kea.isc.org/git/kea into trac3536

11 years ago[3536] Changes after review:
Tomek Mrugalski [Tue, 23 Sep 2014 11:23:13 +0000 (13:23 +0200)] 
[3536] Changes after review:

 - Logging section updated.
 - Missing coma in kea.conf.pre added
 - ${localstatedir}/log is now created

11 years agoMerge pull request #1 from adwol/master
Tomek Mrugalski [Fri, 19 Sep 2014 10:08:26 +0000 (12:08 +0200)] 
Merge pull request #1 from adwol/master

docs fixes

11 years ago[3591] Small edits of logging documentation during review.
Stephen Morris [Thu, 18 Sep 2014 17:29:32 +0000 (18:29 +0100)] 
[3591] Small edits of logging documentation during review.

11 years ago[3536] Missing coma added.
Tomek Mrugalski [Thu, 18 Sep 2014 14:51:28 +0000 (16:51 +0200)] 
[3536] Missing coma added.

11 years ago[3591] Fix for DESTDIR installation hook
Tomek Mrugalski [Thu, 18 Sep 2014 14:07:15 +0000 (16:07 +0200)] 
[3591] Fix for DESTDIR installation hook

11 years ago- s/pool/pools/ in docs 1/head
Adam Osuchowski [Thu, 18 Sep 2014 12:49:23 +0000 (14:49 +0200)] 
- s/pool/pools/ in docs
- add brackets and braces in pools

11 years agoupdate ChangeLog trac3595_base
Francis Dupont [Wed, 17 Sep 2014 09:41:53 +0000 (11:41 +0200)] 
update ChangeLog

11 years ago[trac3471] cryptolink code cleanup
Francis Dupont [Wed, 17 Sep 2014 09:41:04 +0000 (11:41 +0200)] 
[trac3471] cryptolink code cleanup

11 years agoupdate ChangeLog
Francis Dupont [Wed, 17 Sep 2014 09:32:42 +0000 (11:32 +0200)] 
update ChangeLog

11 years ago[trac3482] Check OpenSSL SHA-2 support in configure
Francis Dupont [Wed, 17 Sep 2014 09:31:49 +0000 (11:31 +0200)] 
[trac3482] Check OpenSSL SHA-2 support in configure

11 years ago[3588] Removed the setCfgOptionDef modifier.
Marcin Siodelski [Wed, 17 Sep 2014 05:53:50 +0000 (07:53 +0200)] 
[3588] Removed the setCfgOptionDef modifier.

The modifications to the staging configuration are performed on the pointer
returned by getCfgOptionDef.

11 years ago[3588] Return pointer to the RW option definition configs, not a reference.
Marcin Siodelski [Tue, 16 Sep 2014 18:57:07 +0000 (20:57 +0200)] 
[3588] Return pointer to the RW option definition configs, not a reference.

11 years ago[3536] logging example in kea.conf in keactrl fixed
Tomek Mrugalski [Tue, 16 Sep 2014 18:13:16 +0000 (20:13 +0200)] 
[3536] logging example in kea.conf in keactrl fixed

11 years ago[3536] Logging section in User's Guide updated.
Tomek Mrugalski [Tue, 16 Sep 2014 17:55:49 +0000 (19:55 +0200)] 
[3536] Logging section in User's Guide updated.

11 years ago[3588] Implemented CfgOptionDef class to represent user-defined option defs
Marcin Siodelski [Tue, 16 Sep 2014 15:54:43 +0000 (17:54 +0200)] 
[3588] Implemented CfgOptionDef class to represent user-defined option defs

11 years ago[master] Added ChangeLog entry for #3538.
Marcin Siodelski [Tue, 16 Sep 2014 15:44:57 +0000 (17:44 +0200)] 
[master] Added ChangeLog entry for #3538.

11 years ago[master] Merge branch 'trac3538'
Marcin Siodelski [Tue, 16 Sep 2014 15:26:05 +0000 (17:26 +0200)] 
[master] Merge branch 'trac3538'

11 years ago[3538] Extended description of the subnet4 as pointed out in the review.
Marcin Siodelski [Tue, 16 Sep 2014 15:24:42 +0000 (17:24 +0200)] 
[3538] Extended description of the subnet4 as pointed out in the review.

11 years ago[master] Added ChangeLog for #3534.
Marcin Siodelski [Tue, 16 Sep 2014 11:52:08 +0000 (13:52 +0200)] 
[master] Added ChangeLog for #3534.

11 years ago[master] Merge branch 'trac3534'
Marcin Siodelski [Tue, 16 Sep 2014 11:12:23 +0000 (13:12 +0200)] 
[master] Merge branch 'trac3534'

Conflicts:
src/lib/dhcpsrv/tests/daemon_unittest.cc

11 years ago[3534] Refactored Configuration to SrvConfig.
Marcin Siodelski [Mon, 15 Sep 2014 17:27:53 +0000 (19:27 +0200)] 
[3534] Refactored Configuration to SrvConfig.

This change affects many files using the Configuration object and types
derived from it.

11 years ago[3534] Minor correction to the dev guide as a result of a review.
Marcin Siodelski [Mon, 15 Sep 2014 16:19:54 +0000 (18:19 +0200)] 
[3534] Minor correction to the dev guide as a result of a review.

11 years ago[3591] Unnecessary variable set removed.
Tomek Mrugalski [Mon, 15 Sep 2014 15:23:32 +0000 (17:23 +0200)] 
[3591] Unnecessary variable set removed.

11 years ago[3591] Documentation updated.
Tomek Mrugalski [Mon, 15 Sep 2014 14:29:37 +0000 (16:29 +0200)] 
[3591] Documentation updated.

11 years ago[3591] Unit-tests for new variables implemented.
Tomek Mrugalski [Mon, 15 Sep 2014 14:29:26 +0000 (16:29 +0200)] 
[3591] Unit-tests for new variables implemented.

11 years ago[3538] Fixed the pool definitions for DHCPv6 in kea.conf.
Marcin Siodelski [Fri, 12 Sep 2014 15:36:36 +0000 (17:36 +0200)] 
[3538] Fixed the pool definitions for DHCPv6 in kea.conf.

11 years ago[3534] Addressed review comments.
Marcin Siodelski [Fri, 12 Sep 2014 15:29:57 +0000 (17:29 +0200)] 
[3534] Addressed review comments.

11 years ago[3591] Default logging refactored.
Tomek Mrugalski [Fri, 12 Sep 2014 15:20:47 +0000 (17:20 +0200)] 
[3591] Default logging refactored.

11 years ago[3533] Minor changes as a result of review. trac3471_base
Stephen Morris [Wed, 10 Sep 2014 12:45:52 +0000 (13:45 +0100)] 
[3533] Minor changes as a result of review.

Comments have been improved in one file.  The other contains a test
that alters logging, so a test fixture has been added that ressets
the logging back to the default in its destructor.

11 years ago[3538] Corrected the declaration of the example pool in the kea.conf
Marcin Siodelski [Tue, 9 Sep 2014 18:32:59 +0000 (20:32 +0200)] 
[3538] Corrected the declaration of the example pool in the kea.conf

Recently the "pool" parameter has been renamed to "pools" and its type
was changed from the string to a map. The kea.conf was not updated to
use the new format for the pool definition. This change corrects it.

11 years ago[3591] Print error to stderr after failing lock file creation.
Tomek Mrugalski [Tue, 9 Sep 2014 17:11:03 +0000 (19:11 +0200)] 
[3591] Print error to stderr after failing lock file creation.

11 years ago[3591] Logging variables simplified
Tomek Mrugalski [Tue, 9 Sep 2014 16:10:42 +0000 (18:10 +0200)] 
[3591] Logging variables simplified

 - KEA_LOCKFILE_DIR_FROM_BUILD renamed to KEA_LOCKFILE_DIR.
 - KEA_FROM_BUILD_LOCALSTATEDIR, KEA_LOCKFILE_DIR_FROM_BUILD removed
 - It is possible to disable lockfile now

11 years ago[3591] Logging initialization cleaned up
Tomek Mrugalski [Tue, 9 Sep 2014 14:13:59 +0000 (16:13 +0200)] 
[3591] Logging initialization cleaned up

11 years ago[3591] logger_unittest_support no longer overwrites KEA_LOCKFILE_DIR_FROM_BUILD
Tomek Mrugalski [Tue, 9 Sep 2014 14:00:20 +0000 (16:00 +0200)] 
[3591] logger_unittest_support no longer overwrites KEA_LOCKFILE_DIR_FROM_BUILD

11 years ago[3533] Reset logging when unit tests exit
Stephen Morris [Fri, 5 Sep 2014 16:10:03 +0000 (17:10 +0100)] 
[3533] Reset logging when unit tests exit

Some unit tests in dhcpsrv altered the logging configuration but
never reset it. That configuration was then used for subsequent
tests and made them overly verbose.

11 years ago[3534] Logger configuration can be rolled back.
Marcin Siodelski [Wed, 3 Sep 2014 12:25:50 +0000 (14:25 +0200)] 
[3534] Logger configuration can be rolled back.

Previously, the logger configuration was applied (to log4cplus) as soon as
it was parsed. We decided in the jabber discussion that the logger
configuration should only be applied if the whole configuration goes
through. So, the logger configuration is now 2-stage: parsing and commit
as for other configuration parameters.

11 years ago[3534] Commit and rollback the staging configuration.
Marcin Siodelski [Tue, 2 Sep 2014 18:47:10 +0000 (20:47 +0200)] 
[3534] Commit and rollback the staging configuration.

11 years ago[3534] Fixed generation of the default Kea configuration file.
Marcin Siodelski [Mon, 1 Sep 2014 19:41:09 +0000 (21:41 +0200)] 
[3534] Fixed generation of the default Kea configuration file.

11 years ago[3534] It is now possible to revert to a selected previous configuration.
Marcin Siodelski [Mon, 1 Sep 2014 15:32:47 +0000 (17:32 +0200)] 
[3534] It is now possible to revert to a selected previous configuration.

11 years ago[3534] It is now possible to copy entire server configuration.
Marcin Siodelski [Mon, 1 Sep 2014 14:17:52 +0000 (16:17 +0200)] 
[3534] It is now possible to copy entire server configuration.

11 years ago[3534] It is now possible to compare two Configuration objects for equality
Marcin Siodelski [Mon, 1 Sep 2014 13:37:00 +0000 (15:37 +0200)] 
[3534] It is now possible to compare two Configuration objects for equality

11 years ago[3534] Implemented (in)equality operators for CfgIface.
Marcin Siodelski [Mon, 1 Sep 2014 11:01:17 +0000 (13:01 +0200)] 
[3534] Implemented (in)equality operators for CfgIface.

11 years ago[3534] Reset unit test logger in the Daemon.parsingConsoleOutput test.
Marcin Siodelski [Fri, 29 Aug 2014 11:25:42 +0000 (13:25 +0200)] 
[3534] Reset unit test logger in the Daemon.parsingConsoleOutput test.

11 years ago[3534] Fixed invalid condition.
Marcin Siodelski [Fri, 29 Aug 2014 10:37:36 +0000 (12:37 +0200)] 
[3534] Fixed invalid condition.

11 years ago[3534] Renamed CfgMgr::getCurrent to CfgMgr::getCurrentCfg.
Marcin Siodelski [Fri, 29 Aug 2014 09:58:46 +0000 (11:58 +0200)] 
[3534] Renamed CfgMgr::getCurrent to CfgMgr::getCurrentCfg.

11 years ago[3534] Removed CfgMgr::getConfiguration.
Marcin Siodelski [Fri, 29 Aug 2014 09:19:27 +0000 (11:19 +0200)] 
[3534] Removed CfgMgr::getConfiguration.

11 years ago[3534] Better doxygen documentation for CfgMgr.
Marcin Siodelski [Fri, 29 Aug 2014 09:05:50 +0000 (11:05 +0200)] 
[3534] Better doxygen documentation for CfgMgr.

11 years ago[3534] Logging information is accessed by getter.
Marcin Siodelski [Fri, 29 Aug 2014 07:54:47 +0000 (09:54 +0200)] 
[3534] Logging information is accessed by getter.

11 years ago[3534] Basic implementation of staging and rolling back configurations.
Marcin Siodelski [Fri, 29 Aug 2014 07:28:30 +0000 (09:28 +0200)] 
[3534] Basic implementation of staging and rolling back configurations.

11 years agoadd "z" switch to tar example trac3482_base
Jeremy C. Reed [Thu, 28 Aug 2014 20:34:41 +0000 (13:34 -0700)] 
add "z" switch to tar example

Some tar implementations cannot or do not auto detect the compress format.
For example, I saw today:

$ tar xvf kea-0.9.tar.gz
tar: Cannot identify format. Searching...
tar: Cpio file name length 41449 is out of range
tar: Invalid header, starting valid header search.
...
tar: Cpio file name length 39676 is out of range
tar: End of archive volume 1 reached
tar: bcpio vol 1, 0 files, 3811899 bytes read, 0 bytes written in 1 secs (3811899 bytes/sec)
tar: Unexpected EOF on archive file

11 years agoDo not hardcode version in example
Jeremy C. Reed [Thu, 28 Aug 2014 16:37:32 +0000 (09:37 -0700)] 
Do not hardcode version in example

Did say 0.9-beta1 for 0.9 release for example.
So added the __VERSION__ macro.

Note that this may look ugly in the "git" branch or other
odd named versions but will match names if a dist tarball
was created from git master. But will be correct for official releases.

Okayed via jabber.

11 years agoRemove the install-exec-hook target for BIND10 note
Jeremy C. Reed [Thu, 28 Aug 2014 16:36:51 +0000 (09:36 -0700)] 
Remove the install-exec-hook target for BIND10 note

This was probably never seen anyways so I didn't adjust for Kea.
Okayed via jabber.

11 years agoChange BIND 10 to Kea for SEE ALSO reference.
Jeremy C. Reed [Thu, 28 Aug 2014 16:36:17 +0000 (09:36 -0700)] 
Change BIND 10 to Kea for SEE ALSO reference.

11 years agocleanup changelog
Jeremy C. Reed [Thu, 28 Aug 2014 15:41:42 +0000 (08:41 -0700)] 
cleanup changelog

On line 21 use two tabs before the committer username.
On line 21 use a tab before the keyword type.

11 years ago[kea-0.9-release] removed duplicated entry in ChangeLog
Wlodek Wencel [Thu, 28 Aug 2014 06:10:52 +0000 (08:10 +0200)] 
[kea-0.9-release] removed duplicated entry in ChangeLog

11 years ago[kea-0.9-release] ChangeLog fix typo
Wlodek Wencel [Thu, 28 Aug 2014 05:55:14 +0000 (07:55 +0200)] 
[kea-0.9-release] ChangeLog fix typo

11 years ago[kea-0.9-release] ChangeLog entry for release
Wlodek Wencel [Thu, 28 Aug 2014 05:48:03 +0000 (07:48 +0200)] 
[kea-0.9-release] ChangeLog entry for release

11 years agoSay Kea not BIND10 for dummy docs
Jeremy C. Reed [Thu, 28 Aug 2014 15:38:23 +0000 (08:38 -0700)] 
Say Kea not BIND10 for dummy docs

11 years ago[kea-0.9-release] Bind10 name in docs changed
Wlodek Wencel [Thu, 28 Aug 2014 08:15:51 +0000 (10:15 +0200)] 
[kea-0.9-release] Bind10 name in docs changed

11 years agoMerge branch 'trac3429'
Tomek Mrugalski [Wed, 27 Aug 2014 18:45:12 +0000 (20:45 +0200)] 
Merge branch 'trac3429'

11 years ago[3429] Reference to SystemSpecificNotes added, removed bogus DDNS claim
Tomek Mrugalski [Wed, 27 Aug 2014 18:44:49 +0000 (20:44 +0200)] 
[3429] Reference to SystemSpecificNotes added, removed bogus DDNS claim

11 years ago[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea
Tomek Mrugalski [Wed, 27 Aug 2014 16:25:54 +0000 (18:25 +0200)] 
[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

Conflicts:
ChangeLog

11 years ago[master] ChangeLog udpated.
Tomek Mrugalski [Wed, 27 Aug 2014 16:20:29 +0000 (18:20 +0200)] 
[master] ChangeLog udpated.

11 years ago[3532] Compilation fix for PostgreSQL on i686
Tomek Mrugalski [Wed, 27 Aug 2014 16:19:31 +0000 (18:19 +0200)] 
[3532] Compilation fix for PostgreSQL on i686

11 years ago[master] Merge branch 'trac3501'
Marcin Siodelski [Wed, 27 Aug 2014 15:49:39 +0000 (17:49 +0200)] 
[master] Merge branch 'trac3501'

11 years ago[master] Added ChangeLog entry for #3512.
Marcin Siodelski [Wed, 27 Aug 2014 15:47:10 +0000 (17:47 +0200)] 
[master] Added ChangeLog entry for #3512.

11 years ago[master] Merge branch 'trac3512'
Marcin Siodelski [Wed, 27 Aug 2014 15:29:01 +0000 (17:29 +0200)] 
[master] Merge branch 'trac3512'

Conflicts:
src/lib/dhcpsrv/configuration.h

11 years ago[3512] Interface list config parser has separation of the commit and build.
Marcin Siodelski [Wed, 27 Aug 2014 06:58:37 +0000 (08:58 +0200)] 
[3512] Interface list config parser has separation of the commit and build.

11 years agoMerge branch 'master_fixed'
Tomek Mrugalski [Tue, 26 Aug 2014 13:51:12 +0000 (15:51 +0200)] 
Merge branch 'master_fixed'

11 years ago[master] Fixing master after git server migration.
Tomek Mrugalski [Tue, 26 Aug 2014 13:51:07 +0000 (15:51 +0200)] 
[master] Fixing master after git server migration.

Conflicts:
ChangeLog

11 years ago[master] Fix for master being out of sync
Tomek Mrugalski [Tue, 26 Aug 2014 12:02:28 +0000 (14:02 +0200)] 
[master] Fix for master being out of sync

Conflicts:
ChangeLog

11 years ago[3512] Addressed review comments.
Marcin Siodelski [Tue, 26 Aug 2014 11:24:47 +0000 (13:24 +0200)] 
[3512] Addressed review comments.

11 years ago[3512] Renamed IfaceCfg to CfgIface as suggested in the review.
Marcin Siodelski [Tue, 26 Aug 2014 07:15:33 +0000 (09:15 +0200)] 
[3512] Renamed IfaceCfg to CfgIface as suggested in the review.

11 years ago[master] Compilation fix for comparison of std::stream pos value.
Marcin Siodelski [Tue, 26 Aug 2014 05:48:48 +0000 (07:48 +0200)] 
[master] Compilation fix for comparison of std::stream pos value.

This is trivial fix so as I am committing it on my own discretion. Also,
this fix had already been reviewed and applied on master branch but
apparently disappeared after the recent git migration.

11 years ago[3501] Corrected error messages reported when configuration error occurs.
Marcin Siodelski [Mon, 25 Aug 2014 18:10:39 +0000 (20:10 +0200)] 
[3501] Corrected error messages reported when configuration error occurs.

Also, removed multiple references to DHCP4_CONFIG_LOAD_FAIL from the
DHCPv4 server and DHCP6_CONFIG_LOAD_FAIL from the DHCPv6 server.

11 years ago[master] Added ChangeLog entry for #3477.
Marcin Siodelski [Mon, 25 Aug 2014 17:11:39 +0000 (19:11 +0200)] 
[master] Added ChangeLog entry for #3477.

11 years ago[master] Merge branch 'trac3477'
Marcin Siodelski [Mon, 25 Aug 2014 16:39:41 +0000 (18:39 +0200)] 
[master] Merge branch 'trac3477'

11 years agoMerge branch 'master' of ssh://git.kea.isc.org/git/kea
Tomek Mrugalski [Mon, 25 Aug 2014 09:02:00 +0000 (11:02 +0200)] 
Merge branch 'master' of ssh://git.kea.isc.org/git/kea

11 years agolink to mailing lists webpage
Jeremy C. Reed [Fri, 22 Aug 2014 23:19:45 +0000 (16:19 -0700)] 
link to mailing lists webpage

(another test of git server migration :)

11 years agorun tools/reorder_message_file.py on the mes files
Jeremy C. Reed [Fri, 22 Aug 2014 22:48:36 +0000 (15:48 -0700)] 
run tools/reorder_message_file.py on the mes files

(This is a test of new git server :)

11 years ago[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea
Tomek Mrugalski [Fri, 22 Aug 2014 16:51:06 +0000 (18:51 +0200)] 
[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

Conflicts:
ChangeLog

11 years ago[master] Merge branch 'trac3511' (pkg-config dependency removal)
Tomek Mrugalski [Fri, 22 Aug 2014 16:48:24 +0000 (18:48 +0200)] 
[master] Merge branch 'trac3511' (pkg-config dependency removal)

Conflicts:
ChangeLog

11 years ago[master] Added ChangeLog entry for #3420.
Wlodek Wencel [Fri, 22 Aug 2014 16:37:51 +0000 (18:37 +0200)] 
[master] Added ChangeLog entry for #3420.