Merge branch 'main' into jspenc72/25077-apple-mdm-remove-application

fleetdm · Jan 2, 2025 · 48ffe26 · 48ffe26
2 parents dffcaf3 + 7ac39e2
commit 48ffe26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/generate-osqueryd-targets.yml b/.github/workflows/generate-osqueryd-targets.yml
@@ -24,7 +24,7 @@ defaults:
     shell: bash
 
 env:
-  OSQUERY_VERSION: 5.14.1
+  OSQUERY_VERSION: 5.15.0
 
 permissions:
   contents: write

diff --git a/orbit/TUF.md b/orbit/TUF.md
@@ -20,7 +20,7 @@ Following are the currently deployed versions of fleetd components on the `stabl
 |--------------|--------|--------|---------|---------------|
 | orbit        | 1.37.0 | 1.37.0 | 1.37.0  | 1.37.0        |
 | desktop      | 1.37.0 | 1.37.0 | 1.37.0  | 1.37.0        |
-| osqueryd     | 5.14.1 | 5.14.1 | 5.14.1  | 5.14.1        |
+| osqueryd     | 5.15.0 | 5.15.0 | 5.15.0  | 5.15.0        |
 | nudge        | -      | -      | -       | -             |
 | swiftDialog  | -      | -      | -       | -             |
 | escrowBuddy  | -      | -      | -       | -             |