Merge remote-tracking branch 'origin/master'

jazzdotdev · Dec 7, 2018 · e9c97b4 · e9c97b4
2 parents 2433659 + 9819599
commit e9c97b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "torchbear"
 description = "network application framework"
-version = "0.8.4"
+version = "0.8.5"
 authors = ["Mitchell Tannenbaum <tannenbaum.mitchell@gmail.com>"]
 repository = "https://github.com/foundpatterns/torchbear"
 readme = "Readme.md"

diff --git a/Readme.md b/Readme.md
@@ -28,6 +28,7 @@ Note:  You don't need to learn Rust to use Torchbear.
 * [`std::fs::*`](https://doc.rust-lang.org/std/fs/index.html) filesystem operations
 * [`std::collections::HashSet`](https://doc.rust-lang.org/std/collections/struct.HashSet.html) set-theoretic operations
 * [Serde](https://github.com/serde-rs/serde) YAML and JSON serializing/deserializing
+* [SCL](https://github.com/Keats/scl) simple, safe configuration language serializing/deserializing
 * [UUID-rs](https://github.com/uuid-rs/uuid) UUID generation and verification
 * [Chrono](https://github.com/chronotope/chrono) time/date generation and verification
 * [Select-rs](https://github.com/utkarshkukreti/select.rs) HTML scraping

diff --git a/src/handlers/bridge.lua b/src/handlers/bridge.lua
@@ -15,5 +15,5 @@ end, function (msg)
 end)
 
 if not torchbear.handler then
-    log.error("No handler specified")
-end
+    log.debug("No handler specified")
+end