BIND 10 pd-ietf-demo2, updated. d32cde59d6e6f60299d848c2fe08ce4adb733e24 Merge branch 'trac3211' into pd-ietf-demo2

[BIND 10 source code commits]

The branch, pd-ietf-demo2 has been updated
       via  d32cde59d6e6f60299d848c2fe08ce4adb733e24 (commit)
       via  ed43618a2c7b2387d76f99a5a4b1a3e05ac70f5e (commit)
      from  67c66cf3dba200a791e6333b4e46bfeb60fad473 (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 d32cde59d6e6f60299d848c2fe08ce4adb733e24
Merge: 67c66cf ed43618
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Oct 25 15:24:00 2013 +0200

    Merge branch 'trac3211' into pd-ietf-demo2

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

Summary of changes:
 ChangeLog                        |    2 +-
 src/lib/dhcp/option_definition.h |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 0eb01b3..916d7df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 7XX.	[bug]		tomek
-	libdhcp++: Incoming IAPREFIX option is now parsed properly.
+	libdhcp++: Incoming DHCPv6 IAPREFIX option is now parsed properly.
 	(Trac #3211, git ABCD)
 
 700.	[func]		tomek,marcin
diff --git a/src/lib/dhcp/option_definition.h b/src/lib/dhcp/option_definition.h
index 8f2d367..25ce5e2 100644
--- a/src/lib/dhcp/option_definition.h
+++ b/src/lib/dhcp/option_definition.h
@@ -453,7 +453,6 @@ public:
     ///
     /// @throw isc::OutOfRange if provided option buffer is too short or
     /// too long. Expected size is 12 bytes.
-    /// @throw isc::BadValue if specified universe value is not V6.
     static OptionPtr factoryIA6(uint16_t type,
                                 OptionBufferConstIter begin,
                                 OptionBufferConstIter end);
@@ -466,7 +465,6 @@ public:
     ///
     /// @throw isc::OutOfRange if provided option buffer is too short or
     /// too long. Expected size is 24 bytes.
-    /// @throw isc::BadValue if specified universe value is not V6.
     static OptionPtr factoryIAAddr6(uint16_t type,
                                     OptionBufferConstIter begin,
                                     OptionBufferConstIter end);
@@ -477,9 +475,8 @@ public:
     /// @param begin iterator pointing to the beginning of the buffer.
     /// @param end iterator pointing to the end of the buffer.
     ///
-    /// @throw isc::OutOfRange if provided option buffer is too short or
-    /// too long. Expected size is 25 bytes.
-    /// @throw isc::BadValue if specified universe value is not V6.
+    /// @throw isc::OutOfRange if provided option buffer is too short.
+    /// Expected minimum size is 25 bytes.
     static OptionPtr factoryIAPrefix6(uint16_t type,
                                       OptionBufferConstIter begin,
                                       OptionBufferConstIter end);