diff --git a/CHANGES b/CHANGES index a44762d2c7..75c71c9ddd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,13 +1,13 @@ -2.4-5 | 2015-06-19 14:06:15 -0700 +2.4-6 | 2015-06-19 16:26:40 -0700 * Generate protocol confirmations for Modbus, making it appear as a confirmed service in conn.log. (Seth Hall) * Put command line options in alphabetical order. (Daniel Thayer) - * Remove unused code fo no longer supported -G command line option. - (Robin Sommer) + * Removing dead code for no longer supported -G switch. (Robin + Sommer) (Robin Sommer) 2.4 | 2015-06-09 07:30:53 -0700 diff --git a/VERSION b/VERSION index 64cafda62b..8b75168341 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-5 +2.4-6 diff --git a/aux/broker b/aux/broker index f303cdbc60..441fabed0f 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit f303cdbc60ad6eef35ebcd1473ee85b3123f5ef1 +Subproject commit 441fabed0fba6d47456ba18ccbe8aaed30dbcfd1 diff --git a/aux/btest b/aux/btest index 80b42ee3e4..6a47a3296a 160000 --- a/aux/btest +++ b/aux/btest @@ -1 +1 @@ -Subproject commit 80b42ee3e4503783b6720855b28e83ff1658c22b +Subproject commit 6a47a3296a7dace03cf1a16f0f630a9d09ed4f3c diff --git a/src/main.cc b/src/main.cc index ff28781ca2..e5ea5acce6 100644 --- a/src/main.cc +++ b/src/main.cc @@ -490,7 +490,6 @@ int main(int argc, char** argv) {"analyze", required_argument, 0, 'z'}, {"no-checksums", no_argument, 0, 'C'}, {"force-dns", no_argument, 0, 'F'}, - {"load-seeds", required_argument, 0, 'G'}, {"save-seeds", required_argument, 0, 'H'}, {"set-seed", required_argument, 0, 'J'}, {"md5-hashkey", required_argument, 0, 'K'}, @@ -650,10 +649,6 @@ int main(int argc, char** argv) dns_type = DNS_FORCE; break; - case 'G': - seed_load_file = optarg; - break; - case 'H': seed_save_file = optarg; break;