From 79c7fd7c82688c3b8dbfd449a0c513fea97807b3 Mon Sep 17 00:00:00 2001
From: bpaunescu <bogdan.paunescu@r3.com>
Date: Tue, 20 Mar 2018 17:13:30 +0000
Subject: [PATCH] Merge remote-tracking branch 'open/master' into
 bogdan-merge-20-03-18

# Conflicts:
#	docs/source/changelog.rst

added missing changelog line
---
 docs/source/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index b613e9fcf3..36ed362c47 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -19,6 +19,8 @@ from the previous milestone release.
 
 * java.security.cert.CRLReason added to the default Whitelist.
 
+* java.security.cert.X509CRL serialization support added.
+
 * Added ``NetworkMapCache.getNodesByLegalName`` for querying nodes belonging to a distributed service such as a notary cluster
   where they all share a common identity. ``NetworkMapCache.getNodeByLegalName`` has been tightened to throw if more than
   one node with the legal name is found.