Merge branch 'master' into chore/writeToLegacy

librato · Apr 10, 2017 · 40dc7f9 · 40dc7f9
2 parents e094a54 + 6294d1a
commit 40dc7f9
Show file tree

Hide file tree

Showing 7 changed files with 2,576 additions and 378 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,14 @@
+{
+    "parserOptions": {
+      "ecmaVersion": 6
+    },
+    "rules": {
+      "one-var-declaration-per-line": "error",
+      "quotes": ["error", "single"],
+      "no-var": "off",
+      "max-len": "warn",
+      "guard-for-in": "warn",
+      "eqeqeq": "warn"
+    },
+    "extends": "google"
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,14 @@
 language: node_js
-node_js:
+node_js: 
+  - "stable"
+  - "6"
+  - "5"
+  - "4"
+  - "0.12"
   - "0.10"
-  - "0.8"
+matrix:
+  fast_finish: true
 before_script:
   - npm install -g nodeunit
+notifications:
+  email: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## [2.0.7] - 2017-04-06
+
+### Changed
+
+- Updated some documentation and re-enabled a TravisCI with a build matrix
+
+## [2.0.6] - 2017-04-06
+
+### Fixed
+- [#73](https://github.com/librato/statsd-librato-backend/pull/73) Fixed an issue where `sum` was not properly calculated for a timer.
+
+## [2.0.5] - 2017-03-13
+
+### Fixed
+- [#70](https://github.com/librato/statsd-librato-backend/pull/70) Fixed an issue where legacy payloads were being sent to Librato incorrectly.
+
 ## [2.0.4] - 2017-03-06
 
 ### Fixed