BIND 10 master, updated. 7ff403a459b34457e433a4cf87ee9fdc64ba5af1 Merge #2871

[BIND 10 source code commits]

The branch, master has been updated
       via  7ff403a459b34457e433a4cf87ee9fdc64ba5af1 (commit)
       via  bb0d8b35c3f52e2900abccda0f52995683eee4ab (commit)
       via  bf807435010663e517215f69a5777b76f903927b (commit)
       via  6287fdfff0892a1a71312e0cd2109a03c00cdaea (commit)
       via  6700ecd585dac224bd92008fef7f6ee8a275d04b (commit)
       via  e7f74b8e4b4b8b63d1ebddac464cf713f18e8a15 (commit)
       via  953b4dcd1d40790aafa513ed9be7409da2128ae9 (commit)
       via  e0f000ed71e1eb4a83b8db1b28ff96b6d13b6481 (commit)
       via  a16cb0089b11bb4a2cbc3230ee6870693c469fc7 (commit)
       via  104820a94bef55a4fa1de729723cffc0e3801ac5 (commit)
       via  81d23e305105f215c3d6142f750445f7e2ce0fe2 (commit)
       via  1e763b3d4808e0f722e2f971b726cae5aefde463 (commit)
       via  146f2e6c679ee84783d3b260cf96dac35de9511b (commit)
      from  33e10c84c8b6ab274c157816ba81e6d2fc8ba628 (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 7ff403a459b34457e433a4cf87ee9fdc64ba5af1
Merge: bb0d8b3 bf80743
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Apr 30 09:06:46 2013 +0200

    Merge #2871
    
    Fake work for resolution models testing.
    
    (The correct version of branch now)

commit bb0d8b35c3f52e2900abccda0f52995683eee4ab
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Apr 30 09:05:34 2013 +0200

    Revert "Merge #2871"
    
    This reverts commit 33e10c84c8b6ab274c157816ba81e6d2fc8ba628, reversing
    changes made to 3a382331f1308099930d6b653dd6d11b70da8e22.
    
    Revert the merge of wrong version of branch.

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

Summary of changes:
 src/bin/resolver/bench/dummy_work.cc      |    2 +-
 src/bin/resolver/bench/dummy_work.h       |    2 +-
 src/bin/resolver/bench/fake_resolution.cc |    2 +-
 src/bin/resolver/bench/fake_resolution.h  |    2 +-
 src/bin/resolver/bench/naive_resolver.cc  |    2 +-
 src/bin/resolver/bench/naive_resolver.h   |    2 +-
 src/lib/asiolink/io_service.cc            |    2 +-
 src/lib/asiolink/io_service.h             |    2 +-
 src/lib/bench/benchmark.h                 |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/bench/dummy_work.cc b/src/bin/resolver/bench/dummy_work.cc
index a0669b3..c17bcbf 100644
--- a/src/bin/resolver/bench/dummy_work.cc
+++ b/src/bin/resolver/bench/dummy_work.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/bin/resolver/bench/dummy_work.h b/src/bin/resolver/bench/dummy_work.h
index aacb222..81fd0f2 100644
--- a/src/bin/resolver/bench/dummy_work.h
+++ b/src/bin/resolver/bench/dummy_work.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/bin/resolver/bench/fake_resolution.cc b/src/bin/resolver/bench/fake_resolution.cc
index a538302..c08e45a 100644
--- a/src/bin/resolver/bench/fake_resolution.cc
+++ b/src/bin/resolver/bench/fake_resolution.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/bin/resolver/bench/fake_resolution.h b/src/bin/resolver/bench/fake_resolution.h
index 0fc0b40..c2011d3 100644
--- a/src/bin/resolver/bench/fake_resolution.h
+++ b/src/bin/resolver/bench/fake_resolution.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/bin/resolver/bench/naive_resolver.cc b/src/bin/resolver/bench/naive_resolver.cc
index 3c50271..1654496 100644
--- a/src/bin/resolver/bench/naive_resolver.cc
+++ b/src/bin/resolver/bench/naive_resolver.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/bin/resolver/bench/naive_resolver.h b/src/bin/resolver/bench/naive_resolver.h
index fdf3c56..e1deff1 100644
--- a/src/bin/resolver/bench/naive_resolver.h
+++ b/src/bin/resolver/bench/naive_resolver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc
index ad4ae94..0d791a1 100644
--- a/src/lib/asiolink/io_service.cc
+++ b/src/lib/asiolink/io_service.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011,2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/lib/asiolink/io_service.h b/src/lib/asiolink/io_service.h
index 7e0da8f..e086997 100644
--- a/src/lib/asiolink/io_service.h
+++ b/src/lib/asiolink/io_service.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011,2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
diff --git a/src/lib/bench/benchmark.h b/src/lib/bench/benchmark.h
index 029f95a..23dc364 100644
--- a/src/lib/bench/benchmark.h
+++ b/src/lib/bench/benchmark.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010,2013  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above