update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / .gitattributes

diff --git a/ceph/.gitattributes b/ceph/.gitattributes
index 93a74fe40a6aaf39f7edbf3197f7125cb9c53cb3..3b377324cbd120dfb0dbb8551f6cc7f7718ce91c 100644 (file)
--- a/ceph/.gitattributes
+++ b/ceph/.gitattributes
@@ -1 +1,2 @@
 .githubmap merge=union
+PendingReleaseNotes merge=union