Marcin Siodelski
1cbacf19a2
[master] Merge branch 'trac2704'
2013-02-12 16:22:43 +01:00
Thomas Markwalder
88b964a46c
[master] changelog entry for #2699,#2703
2013-02-12 09:21:54 -05:00
Thomas Markwalder
1197c10bcf
Merge branch 'master' into trac2699_2
2013-02-12 09:09:00 -05:00
Thomas Markwalder
97371cff7f
[2699] - Added 2013 to copyright notice in dhcpbdb_create.mysql
2013-02-12 09:00:18 -05:00
Thomas Markwalder
54bbed5fcb
[2699] Added composite search indexes to lease4 and lease6 tables to boost performance.
...
Note: This change fulfills both 2699 (lease4) and 2703 (lease6).
2013-02-12 07:50:50 -05:00
Stephen Morris
aff7100abe
[master] ChangeLog for #2681
2013-02-12 12:32:32 +00:00
Stephen Morris
87ce14cdb1
[master] Merge branch 'trac2681'
2013-02-12 12:29:06 +00:00
Stephen Morris
cf0ce4bad6
[2681] Merge branch 'master' into trac2681
...
Conflicts:
src/lib/dhcpsrv/alloc_engine.cc
2013-02-12 12:28:02 +00:00
Marcin Siodelski
227f2b1dab
[master] Updated ChangeLog for the #2700 .
2013-02-12 12:31:50 +01:00
Marcin Siodelski
b8d6b949eb
[2700] Fix issue where the cmd line switches are printed as ASCII codes.
2013-02-12 10:55:17 +01:00
Marcin Siodelski
5f9c4eec3c
[2704] Use the selectSubnet() subnet function to pick the suitable subnet.
...
The selectSubnet() function offers two ways to find a subnet for a
particular interface: using the name of the interface that the subnet is
configured for; and using the packet source address. Also, the redundant
warning is removed if suitable subnet was not found as this warning is
already issued elsewhere.
2013-02-12 10:11:15 +01:00
Mukund Sivaraman
ea110815f2
Merge branch 'master' into trac2650
2013-02-12 09:13:10 +05:30
JINMEI Tatuya
12071a88b9
[master] Merge branch 'trac2665'
2013-02-11 13:44:47 -08:00
JINMEI Tatuya
e090b84bd5
[master] changelog entry for #2661
2013-02-11 13:42:55 -08:00
JINMEI Tatuya
e6f86f2f5e
[master] Merge branch 'trac2661'
2013-02-11 13:38:22 -08:00
Stephen Morris
3f272be09a
[master] Merge branch 'trac2673'
2013-02-11 15:33:11 +00:00
Tomek Mrugalski
52f22bb013
[master] Merge branch 'trac2702' (DHCPv4 renewal without client-id)
...
Conflicts:
ChangeLog
2013-02-11 15:54:27 +01:00
Stephen Morris
3e367ff100
[2673] Merge branch 'master' into trac2673
2013-02-11 14:39:34 +00:00
Tomek Mrugalski
72106475f6
[2702] ChangeLog updated.
2013-02-11 15:36:42 +01:00
Tomek Mrugalski
5aa5b4e403
[master] Merge branch 'trac2697' (bugfix for dhcp4 and MySQL)
...
Conflicts:
ChangeLog
2013-02-11 14:53:16 +01:00
Stephen Morris
5950991881
[2681] Address review comments
2013-02-11 13:42:18 +00:00
Tomek Mrugalski
dd2dbeb5a4
[2697] ChangeLog updated.
2013-02-11 14:41:18 +01:00
Tomek Mrugalski
daf2abe68c
[2702] Fix for DHCPv4 client renewals (without client-id)
2013-02-11 14:15:49 +01:00
Stephen Morris
1eef52e751
[2673] Correct use of wrong variable in unit test
2013-02-11 12:26:12 +00:00
Mukund Sivaraman
7782afcefe
[master] Update ChangeLog for #2672
2013-02-11 09:46:58 +05:30
Mukund Sivaraman
660a0d164f
Merge branch 'master' into trac2672
...
Conflicts:
src/lib/python/isc/ddns/session.py
2013-02-11 09:31:12 +05:30
Mukund Sivaraman
e540ba5b43
[2650] Add cppcheck suppressions
2013-02-11 09:28:06 +05:30
JINMEI Tatuya
50e61198ea
[2665] use istream::ignore() (and ignore result) to skip chars instead of get()
...
ignoring the result fixes a scan-build error. besides, ignore() should be
more appropriate choice for what it intends to do anyway.
2013-02-09 14:52:37 -08:00
JINMEI Tatuya
aa5b7e1214
[2665] removed unnecessary assignment, fixing one error from clang scan-build.
2013-02-09 14:46:17 -08:00
Marcin Siodelski
9b16b116c9
[master] Updated ChangeLog entry for #2657 .
2013-02-08 18:34:28 +01:00
Marcin Siodelski
1d0c200486
[master] Merge branch 'trac2657'
2013-02-08 18:29:27 +01:00
JINMEI Tatuya
dd447189c8
[2661] protect the output of 'python-config | sed' with [], with more comments.
...
without [] the output it seems possible that the output is empty for some
environments. also clarified that we can ignore the cases where -L isn't
contained at all.
2013-02-08 08:21:01 -08:00
Stephen Morris
b4de323354
[2657] Minor modifications to changed text
...
Also explicitly added a note in the "Installation" section referring
to the BIND 10 DHCP database installation and configuration section.
2013-02-08 13:07:08 +00:00
Mukund Sivaraman
1a80b1dd71
[2672] Rename _ERR suffix to _ERROR in message IDs
2013-02-08 09:56:37 +05:30
JINMEI Tatuya
59c744cf48
[master] Merge branch 'trac1725'
2013-02-07 13:55:01 -08:00
Tomek Mrugalski
b5e2be95d2
[2697] Another fix for empty client-id, this time in MySQL LeaseMgr
2013-02-07 16:58:41 +01:00
Tomek Mrugalski
1d6a2e3fb2
[2697] Lease4::operator== is now safe to use for leases without client-id
2013-02-07 15:28:36 +01:00
Stephen Morris
9645476425
[2681] Handle exceptions thrown when unable to allocate an address
...
Explicit allocation failures cause the return of packet to the client
indicating that the address allocation has been refused. Also added
was a "catch" for other exceptions - this causes the packet from the
client that generated the exception to be ignored.
2013-02-07 12:49:56 +00:00
Mukund Sivaraman
a12aed4bde
[2672] Remove ERROR from various message IDs where not applicable
2013-02-07 10:34:34 +05:30
Mukund Sivaraman
ac75b8db7b
[2672] Remove unused message ID
2013-02-07 10:14:06 +05:30
Mukund Sivaraman
3fa52fbaed
[2672] Fix duplicate use of message ID
...
This is not allowed by our coding style. Use the correct message ID
instead (which was previously unused).
2013-02-07 10:11:37 +05:30
Mukund Sivaraman
55f8f41062
[2672] Make some comment updates fixing spelling, etc.
2013-02-07 10:09:48 +05:30
Mukund Sivaraman
4d6818eb58
[2672] Remove unused message ID
2013-02-07 10:03:28 +05:30
JINMEI Tatuya
530f569e47
[master] Merge branch 'trac2145'
...
fixed Conflicts:
src/bin/bind10/bind10.in
2013-02-06 10:31:09 -08:00
JINMEI Tatuya
da67c0642c
[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
...
commit.
2013-02-06 10:22:33 -08:00
JINMEI Tatuya
6f83737a9b
[master] added redundant 'const' in a function declaration to help SunStudio.
...
It insists signature match between declarations and definitions even with such
unnecessary qualifiers, and fails to link due to a false-positive
"undefined symbol" at the link time.
2013-02-06 18:10:05 +00:00
JINMEI Tatuya
4c439a4cca
[master] added changelog for #1866
2013-02-06 10:06:00 -08:00
JINMEI Tatuya
fbf11f41c3
[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
2013-02-06 09:55:47 -08:00
JINMEI Tatuya
733d42fa3d
[master] adjust latest code for the changes to isc.dns python constants.
...
with one minor regression fix.
2013-02-06 09:55:08 -08:00
JINMEI Tatuya
e500518535
[master] Merge branch 'trac1866'
...
fixed Conflicts:
src/bin/ddns/tests/ddns_test.py
src/bin/xfrin/tests/xfrin_test.py
src/lib/dns/python/tests/zone_checker_python_test.py
src/lib/python/isc/ddns/tests/session_tests.py
2013-02-06 09:16:41 -08:00
