doc/release-notes: more hammer release notes

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index bf83bd28cb1c3282f10512e7c87e8525e2001cad..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -1,10 +0,0 @@
-v0.94
------
-
-* librbd and librados include lttng tracepoints on distros with
-  liblttng 2.4 or later (only Ubuntu Trusty for the ceph.com
-  packages). When running a daemon that uses these libraries, i.e. an
-  application that calls fork(2) or clone(2) without exec(3), you must
-  set LD_PRELOAD=liblttng-ust-fork.so.0 to prevent a crash in the
-  lttng atexit handler when the process exits. The only ceph tool that
-  requires this is rbd-fuse.

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index 26fcf87a9cc05e8531011b8c31ac42e06aa263f6..e130228dca8abbaf8d5ce114c68154a28407aaed 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -15,8 +15,18 @@ Upgrading
   many objects are stored on the node; do not be alarmed if they do
   not marked "up" by the cluster immediately after starting.
 
-
-
+* librbd and librados include lttng tracepoints on distros with
+  liblttng 2.4 or later (only Ubuntu Trusty for the ceph.com
+  packages). When running a daemon that uses these libraries, i.e. an
+  application that calls fork(2) or clone(2) without exec(3), you must
+  set LD_PRELOAD=liblttng-ust-fork.so.0 to prevent a crash in the
+  lttng atexit handler when the process exits. The only ceph tool that
+  requires this is rbd-fuse.
+
+* If rgw_socket_path is defined and rgw_frontends defines a
+  socket_port and socket_host, we now allow the rgw_frontends settings
+  to take precedence.  This change should only affect users who have
+  made non-standard changes to their radosgw configuration.
 
 
 v0.93