Merge branch 'crypto_support' into v1.6.0rc1

Conflicts: ChangeLog package.json src/collectm.js
perfwatcher · May 11, 2015 · d79b397 · d79b397
2 parents 252e9e7 + 082e586
commit d79b397
Show file tree

Hide file tree

Showing 7 changed files with 483 additions and 291 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,9 +1,12 @@
+Version 1.6.0rc1
+
 - PR #10 : added Load plugin (Thanks to Paul Tzianos)
 - PR #11 : added Ping plugin (Thanks to Paul Tzianos)
 - PR #12 : added Disk plugin (Thanks to Paul Tzianos)
 - PR #15 : added Df plugin (Thanks to Paul Tzianos)
 - PR #13 (1) : removed duplicate modules from collectdCompat plugin (Thanks to Paul Tzianos)
 - PR #13 (2) : some modules of CollectdCompat plugin are now optional (Thanks to Paul Tzianos)
+- PR #14 : Added crypto support (Thanks to Dimitris Rozakis)
 
 Version 1.5.1
 

diff --git a/config/default.json b/config/default.json
@@ -10,6 +10,13 @@
 
   "Interval": 60,
 
+// Cryptography/Security settings
+  "Crypto": {
+    "SecurityLevel": 0,
+    "Username": "alice",
+    "Password": "12345678"
+  },
+
 //  Time To Live : will stop Collectm after this value (86400sec = 1 day).
 //  This is useful if you think there is a memory leak and want to reboot periodically
 //  Collectm. Stop Collectm after 86400sec and Windows will restart the service.

diff --git a/node_modules/collectdout/README.md b/node_modules/collectdout/README.md
diff --git a/node_modules/collectdout/lib/index.js b/node_modules/collectdout/lib/index.js
diff --git a/node_modules/collectdout/package.json b/node_modules/collectdout/package.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CollectM",
-  "version": "1.5.1modularization",
+  "version": "1.6.0rc1",
   "author": "Cyril Feraudet",
   "license": "GPLv2",
   "dependancies": {