summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Dibowitz <phil@ipom.com>2014-08-21 14:45:14 -0700
committerPhil Dibowitz <phil@ipom.com>2014-08-21 14:45:14 -0700
commitd7b3ab976a88b1f34d2e59be04f1679af517b77f (patch)
treeb403cbb9efecbbfc25a4d8f1bb999f62985b8cbf
parent8740b73b2c3c0082d8eae1974bbb2bff48f27923 (diff)
parent0a5df68e70bf7b691604594b1c8c22aa6c06a756 (diff)
downloadohai-6-stable.tar.gz
Merge pull request #394 from jaymzh/6-lsblk6-stable
Docs for last commit
-rw-r--r--CHANGELOG.md6
-rw-r--r--RELEASE_NOTES.md4
2 files changed, 2 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d92f80b7..d98742c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,7 @@
## Unreleased Changes
* [**Phil Dibowitz**](https://github.com/jaymzh):
- linux::filesystem now reads all of /proc/mounts instead of just 4K
-* [**Phil Dibowitz**](https://github.com/jaymzh):
- Use lsblk instead of blkid if available.
-* [**Phil Dibowitz**](https://github.com/jaymzh):
- linux::network should handle ECMP routes
+ Fix 10.34.0 regression: qualify device names from lsblk
## Last Release: 6.20.0
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a8dd9b4f..031ac46f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,8 +7,6 @@ Example Note:
Details about the thing that changed that needs to get included in the Release Notes in markdown.
-->
# Ohai Release Notes:
-* linux::filesystem now reads all of /proc/mounts instead of just 4K
-* Use lsblk instead of blkid if available.
-
+* Fix 10.34.0 regression: qualify device names from lsblk
# Ohai Breaking Changes: