Jelte Jansen
dae1d2e24f
[trac710] Merge branch 'master' into trac710
...
Conflicts:
src/bin/cfgmgr/plugins/Makefile.am
src/lib/python/isc/log/Makefile.am
2011-06-17 11:26:39 +02:00
JINMEI Tatuya
ed6ec070b2
[trac710] make sure in xml_handler() the textual representation of XML
...
is a correct string (not bytes, not a string in the form of "b'XXX'")
regardless of whether xml.etree.ElementTree.tostring() returns bytes or
string by default.
2011-06-16 16:25:53 -07:00
JINMEI Tatuya
97131f9739
[trac710] make sure -Wno-unused-parameter is placed after -Wextra.
2011-06-16 16:17:28 -07:00
Jeremy C. Reed
8cad081427
[master] fix twpo misspelling typos
2011-06-16 13:28:22 -05:00
Jelte Jansen
a948a71497
Merge branch 'trac1017'
2011-06-16 18:11:48 +02:00
Jelte Jansen
69da5b8b1b
[trac1018] as jeremy noted, should be += of course
2011-06-16 18:06:42 +02:00
Jelte Jansen
8f95286e55
[trac1018] logging checking code and spec weren't installed
2011-06-16 17:54:49 +02:00
Jelte Jansen
e31eaa10fc
[trac1017] move unnecessary .in files and fix build/srcdir
2011-06-16 15:07:46 +02:00
JINMEI Tatuya
910caee23c
[master] Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10
2011-06-15 10:39:09 -07:00
JINMEI Tatuya
e1bf2fce99
[master] fixed test error due to missing DYLD path for MacOS.
...
patch reviewed on jabber.
2011-06-15 10:38:28 -07:00
Stephen Morris
179a2105dc
[master] Add "." to SUBDIRS
...
Allows "make check" to work without a preceding "make"
2011-06-15 17:40:28 +01:00
Stephen Morris
f7a8e38c73
[master] Add missing BOOST_INCLUDE to compiler flags
2011-06-15 16:59:55 +01:00
Michal 'vorner' Vaner
62318bb5e1
Merge branch 'work/pylog'
2011-06-15 15:06:16 +02:00
Jelte Jansen
dd3c0d1df4
[trac710] remove __pycache__ directories
...
introduced in python3.2, this is where .pyc files are now stored, which of course makes distcheck fail. Added cleandir targets to all directories containing python code.
2011-06-15 12:47:43 +02:00
Jelte Jansen
e580e10dee
[trac710] explicit str() conversion
2011-06-15 11:48:47 +02:00
Jelte Jansen
de063908e8
[trac710] Check if we need -Wno-unused-parameter for Python.h
2011-06-15 11:45:25 +02:00
Michal 'vorner' Vaner
9723ecc53f
[trac756] Remove old comment
2011-06-15 11:32:47 +02:00
Jelte Jansen
576f337f42
[trac756] a few trivial typos
2011-06-15 09:51:57 +02:00
JINMEI Tatuya
f3813c74f5
[master] fixed a build error due to #997 : be more specific about template parameter in the test code
2011-06-14 21:29:48 +00:00
Michal 'vorner' Vaner
e45768f4b9
Merge branch 'work/acl'
2011-06-14 21:00:30 +02:00
Michal 'vorner' Vaner
9652c9fd3f
[trac997] Add a const
2011-06-14 20:59:09 +02:00
JINMEI Tatuya
a5572545c3
[trac997] use camel style for methods.
2011-06-14 20:59:09 +02:00
JINMEI Tatuya
b37a785ae2
[trac997] added blank lines for readability
2011-06-14 20:59:09 +02:00
Michal 'vorner' Vaner
0b99dc120f
[trac997] Return few camels
2011-06-14 20:59:03 +02:00
Michal 'vorner' Vaner
fde3b8cb6f
[trac997] More review comments
2011-06-14 20:58:57 +02:00
JINMEI Tatuya
3f6fb6a54d
[trac997] minor editorial fix: indentation alignment.
2011-06-14 10:02:20 -07:00
Shane Kerr
356ffa38fc
Merge branch 'master' into trac950
2011-06-14 14:21:35 +02:00
Michal 'vorner' Vaner
fe244439fc
[trac997] Address review comments
2011-06-14 12:01:36 +02:00
JINMEI Tatuya
a6c21ad6d6
[trac997] another editorial cleanup: remove a space for style consistency
2011-06-13 17:51:13 -07:00
JINMEI Tatuya
30a20a04aa
[trac997] minor editorial fixes:
...
- add blank lines for readability
- remove white space for style consistency
- use "lower+underscore" style for variables (per the guideline)
2011-06-13 17:26:41 -07:00
Michal 'vorner' Vaner
46f82ccf0e
[trac997] The ACL class implementation
2011-06-13 13:20:21 +02:00
Michal 'vorner' Vaner
d324bf6558
[trac997] The tests
2011-06-13 13:10:08 +02:00
Michal 'vorner' Vaner
49816e5010
[trac977] Prefer shared ptrs
...
They will be needed in future, so we don't want to change the interface
then.
2011-06-13 12:00:52 +02:00
Yoshitaka Aharen
50f16fdb5e
[master] update ChangeLog for trac957
2011-06-13 13:47:56 +09:00
Yoshitaka Aharen
e59c215e14
Merge branch 'master' into trac957
...
Conflicts:
ChangeLog
2011-06-13 10:41:22 +09:00
Michal 'vorner' Vaner
463a593e46
[trac997] Some interface of ACL
2011-06-10 16:36:58 +02:00
Michal 'vorner' Vaner
6c92dafaff
Fix distcheck
2011-06-10 15:33:43 +02:00
Michal 'vorner' Vaner
2826df63af
[trac756] Effective debug level
2011-06-10 13:23:11 +02:00
Michal 'vorner' Vaner
3cf7f4bf3f
[trac756] Enable the previously-buggy test
2011-06-10 13:21:05 +02:00
Michal 'vorner' Vaner
f28bffcf3e
[trac756] Adapt to changed parameter order
2011-06-10 13:20:59 +02:00
Michal 'vorner' Vaner
2a81a3ad5a
Merge branch 'master' into work/pylog
2011-06-10 13:06:27 +02:00
Michal 'vorner' Vaner
c55ce18325
[trac756] Fix test
...
I fixed it in the .py file previously, which didn't survive O:-)
2011-06-10 13:05:10 +02:00
Michal 'vorner' Vaner
9c2b48c4ba
Merge branch 'work/baseclass'
2011-06-10 12:42:21 +02:00
Michal 'vorner' Vaner
c13544e653
[trac977] Protected constructor
2011-06-10 12:39:31 +02:00
chenzhengzhang
1d4cd68ac7
[master] update ChangeLog
2011-06-10 18:06:05 +08:00
chenzhengzhang
261450e93a
[master] merge trac955 : xfrin should check TSIG before other part of incoming message
2011-06-10 18:05:06 +08:00
chenzhengzhang
0bb032a0b6
Merge branch 'master' into trac955
2011-06-10 17:36:03 +08:00
JINMEI Tatuya
99785047d7
[trac955] added some descriptive comments to __match_exception()
2011-06-10 00:06:40 -07:00
JINMEI Tatuya
6135be8219
[trac955] editorial cleanup: removed a redundant white space
...
(not directly related to this branch but just happen to notice it)
2011-06-10 00:06:10 -07:00
Yoshitaka Aharen
49ae23f163
[trac957] apply review comments
2011-06-10 15:24:46 +09:00
