From adcc67e38e062fff6fc2dbbca3590de558662a7a Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Thu, 20 Aug 2020 10:18:31 +0200
Subject: [PATCH 1/2] Update NEWS file

---
 NEWS.rst | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/NEWS.rst b/NEWS.rst
index 794be849..3ba6e845 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -5,7 +5,31 @@ Glances Version 3
 Version 3.1.5
 =============
 
-Under development...
+Enhancements and new features:
+
+    * Enhancement: RSS for containers enhancement #1694
+    * exports: support rabbitmq amqps enhancement #1687
+    * Quick Look missing CPU Infos enhancement #1685
+    * Add amqps protocol suppport for rabbitmq export #1688
+    * Select host in Grafana json #1684
+    * Value for free disk space is counterintuative on ext file systems enhancement #644
+
+Bugs corrected:
+
+    * Can't start server: unexpected keyword argument 'address' bug enhancement #1693
+    * class AmpsList method _build_amps_list() Windows fail (glances/amps_list.py) bug #1689 
+    * Fix grammar in sensors documentation #1681
+    * Reflect "used percent" user disk space for [fs] alert #1680
+    * Bug: [fs] plugin needs to reflect user disk space usage needs test #1658
+    * Fixed formatting on FS example #1673
+    * Missing temperature documentation #1664
+    * Wiki page for starting as a service documentation #1661
+    * How to start glances with --username option on syetemd? documentation #1657
+    * tests using /etc/glances/glances.conf from already installed version bug #1654
+    * Unittests: Use sys.executable instead of hardcoding the python interpreter #1655
+    * Glances should not phone home install #1646
+    * Add lighttpd reverse proxy config to the wiki documentation #1643
+    * Undefined name 'i' in plugins/glances_gpu.py bug #1635
 
 Version 3.1.4
 =============

From dae111efcbb9414d74e14e0e01a0b98a55e3365b Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Wed, 26 Aug 2020 10:01:14 +0200
Subject: [PATCH 2/2] merge conflict in manpage? #1712

---
 docs/man/glances.1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/man/glances.1 b/docs/man/glances.1
index e42a8e58..54bd3bbf 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,10 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-<<<<<<< HEAD
 .TH "GLANCES" "1" "Aug 19, 2020" "3.1.5" "Glances"
-=======
-.TH "GLANCES" "1" "Mar 25, 2020" "3.1.4.1" "Glances"
->>>>>>> master
 .SH NAME
 glances \- An eye on your system
 .