Skip to content
This repository has been archived by the owner on Feb 11, 2020. It is now read-only.

Commit

Permalink
Merge a0ecc0e into aefe29d
Browse files Browse the repository at this point in the history
  • Loading branch information
mcollina committed May 23, 2016
2 parents aefe29d + a0ecc0e commit eef6fcf
Show file tree
Hide file tree
Showing 35 changed files with 293 additions and 1,940 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -7,10 +7,10 @@ addons:
packages:
- g++-4.8
node_js:
- 0.10
- 0.12
- 4
- 5
- 6
services:
- redis-server
- mongodb
Expand Down
31 changes: 2 additions & 29 deletions README.md
Expand Up @@ -28,8 +28,8 @@ Mosca   [![Build Status](https://travis-ci.org/mcollina/mosca.png
### Standalone

```bash
npm install mosca bunyan -g
mosca -v | bunyan
npm install mosca pino -g
mosca -v | pino
```

### Embedded
Expand Down Expand Up @@ -124,37 +124,10 @@ Chat with us on [Mosca's room](https://gitter.im/mcollina/mosca) on Gitter.
* [MQTT protocol](http://mqtt.org)
* [MQTT.js](http://github.com/adamvr/MQTT.js)


## Authors

[Matteo Collina](http://twitter.com/matteocollina)

## Contributors

<table><tbody>
<tr><th align="left">David Halls</th><td><a
href="https://github.com/davedoesdev">GitHub/davedoesdev</a></td>
</tr>
<tr><th align="left">Andrea Reginato</th><td><a
href="https://github.com/andreareginato">GitHub/andreareginato</a></td>
</tr>
<tr><th align="left">Chris Wiggins</th><td><a
href="https://github.com/chriswiggins">GitHub/chriswiggins</a></td>
</tr>
<tr><th align="left">Samir Naik</th><td><a
href="https://github.com/samirnaik">GitHub/samirnaik</a></td>
</tr>
<tr><th align="left">Leo Steiner</th><td><a
href="https://github.com/ldstein">GitHub/ldstein</a></td>
</tr>
<tr><th align="left">John Kokkinidis</th><td><a
href="https://github.com/SudoPlz">GitHub/SudoPlz</a></td>
</tr>
<tr><th align="left">Morgan Cheng</th><td><a
href="https://github.com/mocheng">GitHub/mocheng</a></td>
</tr>
</tbody></table>

## Logo
[Sam Beck](http://two-thirty.tumblr.com)

Expand Down
9 changes: 0 additions & 9 deletions benchmarks/bombing.js

This file was deleted.

0 comments on commit eef6fcf

Please sign in to comment.