Merge branch 'trac1503'

Conflicts:
	ChangeLog
	src/bin/dhcp6/tests/dhcp6_test.py

diff --cc ChangeLog
index 5b9c9d183e77e318c281c9d351c008d649dd571c,3e3bcc54a14b78440a656b486470f2890be791ac..c849b55d0e36af4741eefeb80060894f2073a927
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,13 @@@
 -4XX.  [func]          tomek
++442.  [func]          tomek
+       b10-dhcp4, b10-dhcp6: Both DHCP servers now accept -p parameter
+       that can be used to specify listening port number. This capability
+       is useful only for testing purposes.
 -      (Trac #1503, git TBD)
++      (Trac #1503, git e60af9fa16a6094d2204f27c40a648fae313bdae)
++
 +441.  [func]          tomek
 +      libdhcp++: Stub interface detection (support for interfaces.txt
 +      file) was removed.
 +      (Trac #1281, git 900fc8b420789a8c636bcf20fdaffc60bc1041e0)
  
  bind10-devel-20120517 released on May 17. 2012
  

diff --cc src/bin/dhcp4/tests/Makefile.am
index b956aee8022576921c8594d04032cc0c9ff67d6c,c46b9abde61625a87f46043831e772e59742756d..a327e478c7bdc976d3215fb85963e33785f29bed
--- 1/src/bin/dhcp4/tests/Makefile.am
--- 2/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -1,7 -1,10 +1,11 @@@
  PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
  
- # If necessary (rare cases), explicitly specify paths to dynamic libraries
- # required by loadable python modules.
+ PYTESTS = dhcp4_test.py
+ EXTRA_DIST = $(PYTESTS)
+ 
 -# If necessary (rare cases), explicitly specify paths to dynamic libraries
 -# required by loadable python modules.
++# Explicitly specify paths to dynamic libraries required by loadable python
++# modules. That is required on Mac OS systems. Otherwise we will get exception
++# about python not being able to load liblog library.
  LIBRARY_PATH_PLACEHOLDER =
  if SET_ENV_LIBRARY_PATH
  LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/util/io/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)

diff --cc src/bin/dhcp6/tests/Makefile.am
index d216f534e00869d0492dc6433b01a4b2a28f7886,6a0844fd095aa5a183b1400fafe24f95b058e048..a1a11a075e32c2d5f161db9cab939e17458581b5
--- 1/src/bin/dhcp6/tests/Makefile.am
--- 2/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@@ -2,8 -2,10 +2,9 @@@ PYCOVERAGE_RUN = @PYCOVERAGE_RUN
  PYTESTS = dhcp6_test.py
  EXTRA_DIST = $(PYTESTS)
  
--# If necessary (rare cases), explicitly specify paths to dynamic libraries
--# required by loadable python modules.
++# Explicitly specify paths to dynamic libraries required by loadable python
++# modules. That is required on Mac OS systems. Otherwise we will get exception
++# about python not being able to load liblog library.
  LIBRARY_PATH_PLACEHOLDER =
  if SET_ENV_LIBRARY_PATH
  LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/util/io/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)