From 2cda94e8eef69cc3472834517fdd8646a8f656f9 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Fri, 31 Jan 2020 19:26:29 -0800
Subject: [PATCH] Disable Travis leak test

Travis environment doesn't offer enough memory for running ASan very
well, but Cirrus has it covered anyway.
---
 .travis.yml | 3 ++-
 CHANGES     | 7 +++++++
 VERSION     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f5791cef4..0d9ac5be26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,8 @@ env:
   - distro: fedora_30
   - distro: ubuntu_16.04
   - distro: ubuntu_18.04
-  - distro: ubuntu_18.04_leaktest
+# Travis environment doesn't have enough memory to support ASan well.
+#  - distro: ubuntu_18.04_leaktest
 
 install: sh ci/travis-job install $distro
 
diff --git a/CHANGES b/CHANGES
index 808b9959bd..1e0565a9b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
 
+3.1.0-dev.530 | 2020-02-03 13:21:16 -0800
+
+  * Disable Travis leak test (Jon Siwek, Corelight)
+
+    Travis environment doesn't offer enough memory for running ASan very
+    well, but Cirrus has it covered anyway.
+
 3.1.0-dev.529 | 2020-02-03 13:04:30 -0800
 
   * CMakeLists.txt: fix cross-compilation with binpac (Fabrice Fontaine)
diff --git a/VERSION b/VERSION
index 9ab9ece2ac..0e558a147e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0-dev.529
+3.1.0-dev.530