Merge remote-tracking branch 'origin/topic/timw/remove-brocontrol-dir'

* origin/topic/timw/remove-brocontrol-dir: Remove old obsolete BroControl directory
zeek · Dec 11, 2024 · 315884a · 315884a
2 parents 67ae699 + 72b3b23
commit 315884a
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 109 deletions.
diff --git a/BroControl/__init__.py b/BroControl/__init__.py
diff --git a/BroControl/cmdresult.py b/BroControl/cmdresult.py
diff --git a/BroControl/config.py b/BroControl/config.py
diff --git a/BroControl/plugin.py b/BroControl/plugin.py
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.5.0-76 | 2024-12-11 15:31:45 -0700
+
+  * Remove old obsolete BroControl directory (Tim Wojtulewicz, Corelight)
+
 2.5.0-74 | 2024-12-10 17:22:23 -0700
 
   * Update cmake submodule to master (Tim Wojtulewicz, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -269,8 +269,6 @@ if ( NOT BINARY_PACKAGING_MODE )
   ")
 endif ()
 
-install(DIRECTORY BroControl DESTINATION ${PY_MOD_INSTALL_DIR}/zeekctl)
-
 ########################################################################
 ## Packaging Setup
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0-74
+2.5.0-76
diff --git a/doc/main.rst b/doc/main.rst
@@ -3,7 +3,7 @@
 .. Note: This file includes further autogenerated ones.
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 2.5.0-74
+.. |version| replace:: 2.5.0-76
 
 ===========
 ZeekControl

diff --git a/testing/Baseline/initialization.zeekctl-legacy-option/out b/testing/Baseline/initialization.zeekctl-legacy-option/out
diff --git a/testing/Cfg/plugins/commandtest_legacy.py b/testing/Cfg/plugins/commandtest_legacy.py
diff --git a/testing/Cfg/plugins/zeekctlconfigtest_legacy.py b/testing/Cfg/plugins/zeekctlconfigtest_legacy.py
diff --git a/testing/initialization/zeekctl-legacy-option.test b/testing/initialization/zeekctl-legacy-option.test