diff --git a/.gitmodules b/.gitmodules index c7a9313543..d151b3d288 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,9 @@ [submodule "aux/binpac"] path = aux/binpac url = https://github.com/zeek/binpac -[submodule "aux/broctl"] - path = aux/broctl - url = https://github.com/zeek/broctl +[submodule "aux/zeekctl"] + path = aux/zeekctl + url = https://github.com/zeek/zeekctl [submodule "aux/btest"] path = aux/btest url = https://github.com/zeek/btest diff --git a/CHANGES b/CHANGES index 1d28dd2ed3..5140b3b96b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-287 | 2019-05-14 17:40:40 -0700 + + * Rename broctl submodule to zeekctl (Jon Siwek, Corelight) + 2.6-286 | 2019-05-14 13:19:12 -0700 * Undo an unintentional change to btest.cfg from a recent commit (Daniel Thayer) diff --git a/VERSION b/VERSION index 25be38244b..6d6eb4e3ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-286 +2.6-287 diff --git a/aux/broctl b/aux/broctl deleted file mode 160000 index 2ab58cc88f..0000000000 --- a/aux/broctl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2ab58cc88fd80f1d7a7fc5dd14bfd63b07f285f6 diff --git a/aux/broctl b/aux/broctl new file mode 120000 index 0000000000..d17a55b030 --- /dev/null +++ b/aux/broctl @@ -0,0 +1 @@ +zeekctl \ No newline at end of file diff --git a/aux/zeekctl b/aux/zeekctl new file mode 160000 index 0000000000..b89ebe1582 --- /dev/null +++ b/aux/zeekctl @@ -0,0 +1 @@ +Subproject commit b89ebe15821d0d1ef895149f4dd97336789c7910