BIND 10 master, updated. 550a5e0da25f7b3fa8051d988d70c116490b0f74 Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  550a5e0da25f7b3fa8051d988d70c116490b0f74 (commit)
       via  286787bed2ffcf6ea6ff2da240edc9f78ef0660d (commit)
      from  c405fba738036d7df5fe2b3792bb70a9b9eda9f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 550a5e0da25f7b3fa8051d988d70c116490b0f74
Merge: 286787b c405fba
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Wed Dec 12 20:04:00 2012 +0100

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 286787bed2ffcf6ea6ff2da240edc9f78ef0660d
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Wed Dec 12 20:03:47 2012 +0100

    [master] Dhcp4Parser.testUint32Parser temporarily disabled

-----------------------------------------------------------------------

Summary of changes:
 src/bin/dhcp4/tests/config_parser_unittest.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 22307df..a4ccabd 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -252,7 +252,7 @@ TEST_F(Dhcp4ParserTest, poolPrefixLen) {
 /// and properly err of out of range values. As we can't call Uint32Parser
 /// directly, we are exploiting the fact that it is used to parse global
 /// parameter renew-timer and the results are stored in uint32_defaults.
-TEST_F(Dhcp4ParserTest, Uint32Parser) {
+TEST_F(Dhcp4ParserTest, DISABLED_Uint32Parser) {
 
     ConstElementPtr status;