Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath: Update install instructions for Ubuntu 18.04
ashcore · May 1, 2018 · d5ff658 · d5ff658
2 parents c859919 + 1d98a99
commit d5ff658
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,8 @@
 
+2.5-547 | 2018-05-01 18:17:14 -0500
+
+  * Update install instructions for Ubuntu 18.04 (Daniel Thayer)
+
 2.5-545 | 2018-05-01 18:09:30 -0500
 
   * Improve canonicalization of build dir path in a coverage unit test

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5-545
+2.5-547
diff --git a/doc/install/install.rst b/doc/install/install.rst
@@ -63,8 +63,8 @@ To install the required dependencies, you can use:
 
      sudo apt-get install cmake make gcc g++ flex bison libpcap-dev libssl-dev python-dev swig zlib1g-dev
 
-  In order to build Bro on Debian 9, install ``libssl1.0-dev`` instead
-  of ``libssl-dev``.
+  In order to build Bro on Debian 9 or Ubuntu 18.04, install ``libssl1.0-dev``
+  instead of ``libssl-dev``.
 
 * FreeBSD: