Merge pull request #108 from mlsecproject/version

Prep and cleanup for verison bump to 0.1.2
mlsecproject · Jan 8, 2015 · 17fc063 · 17fc063
2 parents e4d3716 + 418c33a
commit 17fc063
Show file tree

Hide file tree

Showing 6 changed files with 9,053 additions and 7,403 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,19 @@
 CHANGE LOG
 ==========
 
-#### Unreleased Version
-* Exporting extracted data to CRITs ([#84](https://github.com/mlsecproject/combine/issues/84), [#91](https://github.com/mlsecproject/combine/issues/91)) - thanks to [@paulpc](https://github.com/paulpc)
+#### 0.1.2 Bouncing Capybara
+This is a bugfix release with several stability and performance improvements
+
+* Multiple Enrichment Speedups:
+  * Rewrite of ASN enrichment code
+  ([#42](https://github.com/mlsecproject/combine/issues/42),
+  [#104](https://github.com/mlsecproject/combine/issues/104))
+  * Speedup of GeoIP code - thanks to [@jeffbryner](https://github.com/jeffbryner)
+* Better csv-based extraction on packetmail - thanks to [@btv](https://github.com/btv)
+* Exporting extracted data to CRITs ([#84](https://github.com/mlsecproject/combine/issues/84), [#91](https://github.com/mlsecproject/combine/issues/91), [#94](https://github.com/mlsecproject/combine/issues/94)) - thanks to [@paulpc](https://github.com/paulpc)
+* Better Logging Facility ([#34](https://github.com/mlsecproject/combine/issues/34))
+* Updated grequests and Exception Handling ([#78](https://github.com/mlsecproject/combine/issues/78),
+[#32](https://github.com/mlsecproject/combine/issues/32))
 
 #### 0.1.1 Ascending Capybara
 This is a bugfix release to improve the stability of "tiq-test" enriched data generation

diff --git a/data/GeoIP.dat b/data/GeoIP.dat