Skip to content

Commit

Permalink
Merge pull request #38 from electricimp/develop
Browse files Browse the repository at this point in the history
v2.0.2
  • Loading branch information
Pavel Petroshenko authored Jan 2, 2019
2 parents 8580a0a + 621ffce commit 662c52e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Rocky 2.0.1
# Rocky 2.0.2

[![Build Status](https://api.travis-ci.org/electricimp/Rocky.svg?branch=master)](https://travis-ci.org/electricimp/Rocky)

Expand Down Expand Up @@ -44,7 +44,7 @@ Rocky is an framework for building powerful and scalable APIs for your imp-power
Calling the Rocky constructor creates a new Rocky application. An optional *options* table can be passed into the constructor to override default behaviours:

```squirrel
#require "rocky.class.nut:2.0.1"
#require "rocky.class.nut:2.0.2"
app <- Rocky()
```
Expand Down
4 changes: 2 additions & 2 deletions Rocky.class.nut
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const ROCKY_PARSE_ERROR = "Error parsing body of request";

class Rocky {

static VERSION = "2.0.1";
static VERSION = "2.0.2";

// Route handlers, event handers, and middleware
_handlers = null;
Expand Down Expand Up @@ -368,7 +368,7 @@ class Rocky {
}
function _defaultTimeoutHandler(context) {
context.send(500, format("Agent Request Timedout after %i seconds.", _timeout));
context.send(500, format("Agent Request timed out after %i seconds.", _timeout));
}
function _defaultExceptionHandler(context, ex) {
Expand Down

0 comments on commit 662c52e

Please sign in to comment.