Changelogs updated

Changelog.txt

@@ -2,7 +2,7 @@ Changelog
 =========
 
 
-v2.4.83 (2017-12-05)
+v2.4.83 (2017-12-06)
 --------------------
 
 New
@@ -59,6 +59,13 @@ Changes
 
 Fix
 ~~~
+- Updated pyMISP recommended version. [iglocska]
+- PyMISP updated. [iglocska]
+- Removed the requirement for a comment from the import modules.
+  [iglocska]
+
+  - if the comment field is set don't override it
+- Fixed PyMISP version. [iglocska]
 - Removed unused variable. [iglocska]
 - Latest version of the MISP galaxy. [Alexandre Dulaunoy]
 - Latest version of MISP objects. [Alexandre Dulaunoy]

PyMISP-Changelog.txt

@@ -5,12 +5,17 @@ Changelog
 %%version%% (unreleased)
 ------------------------
 
+Changes
+~~~~~~~
+- Update changelog. [Raphaël Vinot]
+
+
+v2.4.83 (2017-12-06)
+--------------------
+
 New
 ~~~
 - Add get CSV method. [Raphaël Vinot]
-- Proper debug system. [Raphaël Vinot]
-
-  Make it easy to investigate the json blobs sent to the server.
 
 Changes
 ~~~~~~~
@@ -38,16 +43,6 @@ Changes
 - Improve documentation. [Raphaël Vinot]
 
   Fix #121
-- Bump PyMISP version. [Raphaël Vinot]
-- Bump CHANGELOG. [Raphaël Vinot]
-- Bump misp-objects. [Raphaël Vinot]
-- Update readme for new logging system. [Raphaël Vinot]
-- Small improvments in the logging system. [Raphaël Vinot]
-- Properly use python logging module. [Raphaël Vinot]
-- Update asciidoctor generator. [Raphaël Vinot]
-- Remove warning if PyMISP is too new. [Raphaël Vinot]
-- Add simple asciidoc generator for MISP event. [Raphaël Vinot]
-- Update changelog. [Raphaël Vinot]
 
 Fix
 ~~~
@@ -56,27 +51,27 @@ Fix
 - Bump describeTypes.json. [Raphaël Vinot]
 
   Add testing
-- Typo loger -> logger. [Raphaël Vinot]
-- Let load unknown object relations in known templates. [Raphaël Vinot]
-
-  This isn't recommended, but happens very often.
-- Allow to load non-malware ZIP files in MISP Event. [Raphaël Vinot]
-
-  Prior to his patch, any zip file loaded by MISP Event was unpacked and
-  processed as an excrypted malware from MISP.
-- Properly pass the distribution when uploading a sample. [Raphaël
-  Vinot]
-- Properly upload a sample in an existing event. [Raphaël Vinot]
-
-  Fix https://github.com/MISP/PyMISP/issues/123
-- Properly set the distribution at event level. [Raphaël Vinot]
-
-  fix #120
-- Properly pop the distribution key. [Raphaël Vinot]
-- Update dependencies for VT generator. [Raphaël Vinot]
 
 Other
 ~~~~~
+- Merge pull request #147 from StrayLightning/master. [Raphaël Vinot]
+
+  Check explicitly for a 500 response from the server with no response content
+- Improve the exception message for a server 500+ response with no
+  response content. [StrayLightning]
+- Check for zero-length 500 response from the server and produce a
+  suitable error message. [StrayLightning]
+
+  In experimenting with PyMISP I am triggering problems on the server I
+  am using.  Occasionally the server will return a 500 response with a
+  message indicating an internal error, but more often than not it returns
+  a 500 response with no contents, and _check_response falls over itself,
+  generating hard-to-fathom exception from the json internals.
+
+  This commit hardens _check_response by detecting zero-length responses
+  and raising a suitable exception.
+
+  Also fix a missing bracket in one of the subsequent exception strings.
 - Merge pull request #146 from c-goes/lief_integrity_exception. [Raphaël
   Vinot]
 
@@ -118,6 +113,53 @@ Other
   - use objects, attribute tags and object references correctly
   - generate quickhashlist for fast lookups / future MISP caching mechanism
   - saner structure (herp-a-derp)
+
+
+v2.4.82 (2017-11-09)
+--------------------
+
+New
+~~~
+- Proper debug system. [Raphaël Vinot]
+
+  Make it easy to investigate the json blobs sent to the server.
+
+Changes
+~~~~~~~
+- Bump PyMISP version. [Raphaël Vinot]
+- Bump CHANGELOG. [Raphaël Vinot]
+- Bump misp-objects. [Raphaël Vinot]
+- Update readme for new logging system. [Raphaël Vinot]
+- Small improvments in the logging system. [Raphaël Vinot]
+- Properly use python logging module. [Raphaël Vinot]
+- Update asciidoctor generator. [Raphaël Vinot]
+- Remove warning if PyMISP is too new. [Raphaël Vinot]
+- Add simple asciidoc generator for MISP event. [Raphaël Vinot]
+- Update changelog. [Raphaël Vinot]
+
+Fix
+~~~
+- Typo loger -> logger. [Raphaël Vinot]
+- Let load unknown object relations in known templates. [Raphaël Vinot]
+
+  This isn't recommended, but happens very often.
+- Allow to load non-malware ZIP files in MISP Event. [Raphaël Vinot]
+
+  Prior to his patch, any zip file loaded by MISP Event was unpacked and
+  processed as an excrypted malware from MISP.
+- Properly pass the distribution when uploading a sample. [Raphaël
+  Vinot]
+- Properly upload a sample in an existing event. [Raphaël Vinot]
+
+  Fix https://github.com/MISP/PyMISP/issues/123
+- Properly set the distribution at event level. [Raphaël Vinot]
+
+  fix #120
+- Properly pop the distribution key. [Raphaël Vinot]
+- Update dependencies for VT generator. [Raphaël Vinot]
+
+Other
+~~~~~
 - Merge pull request #126 from CenturyLinkCIRT/master. [Raphaël Vinot]
 
   Added vt_to_misp.py example and VTReportObject