1. 22 Nov, 2013 6 commits
  2. 21 Nov, 2013 1 commit
    • Marcin Siodelski's avatar
      [3035] Merge branch 'master' into trac3035 · c587763b
      Marcin Siodelski authored
      Conflicts:
      	doc/devel/mainpage.dox
      	src/bin/dhcp4/dhcp4.dox
      	src/bin/dhcp4/dhcp4_srv.cc
      	src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
      	src/bin/dhcp4/tests/dhcp4_test_utils.h
      	src/lib/dhcp_ddns/tests/ncr_unittests.cc
      	src/lib/dhcpsrv/lease_mgr.cc
      	src/lib/dhcpsrv/lease_mgr.h
      	src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
      c587763b
  3. 20 Nov, 2013 5 commits
  4. 19 Nov, 2013 2 commits
  5. 18 Nov, 2013 1 commit
  6. 15 Nov, 2013 5 commits
  7. 14 Nov, 2013 9 commits
  8. 13 Nov, 2013 3 commits
  9. 08 Nov, 2013 1 commit
  10. 07 Nov, 2013 2 commits
  11. 01 Nov, 2013 1 commit
  12. 31 Oct, 2013 2 commits
    • Mukund Sivaraman's avatar
      Merge branch 'trac3172' · 2696320e
      Mukund Sivaraman authored
      Conflicts:
      	src/bin/dhcp6/dhcp6_srv.h
      2696320e
    • Jeremy C. Reed's avatar
      [master] fix xsltproc --stringparam html.stylesheet usage · dfd3f41f
      Jeremy C. Reed authored
      This is to set the location of the css stylesheet.
      Previously it pointed to a path in the source directory.
      By default, this was "./" so was okay as a location via HTTP.
      But when built using a different source directory, then
      the full source directory ended up as a reference on the webpage
      so then style's didn't work.
      
      I briefly discussed this on jabber yesterday but didn't get an okay.
      It is a minor fix, so committing per my discretion.
      dfd3f41f
  13. 30 Oct, 2013 1 commit
  14. 29 Oct, 2013 1 commit
    • Kean Johnston's avatar
      [3172] Fix build failure on BSD systems · 66518462
      Kean Johnston authored
      The comment at the end of adding to AM_CXXFLAGS was making the total
      line too long, and the automake tool was splitting the line. This meant
      that the macro assignment had an escaped comment, which the BSD make
      interprets differently to GNU make (the latter swallows the next line as
      part of the comment, whereas the former doesn't).
      66518462