Skip to content

Commit

Permalink
Merge branch 'master' of github.com:neumino/rethinkdbdash
Browse files Browse the repository at this point in the history
  • Loading branch information
neumino committed Sep 14, 2016
2 parents f0bbf69 + 7865e01 commit f77d2ff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ _Note_: The error `__rethinkdbdash_ping__` is used for internal purposes (ping).
#### Connection pool
As mentionned before, `rethinkdbdash` has a connection pool and manage all the connections
As mentioned before, `rethinkdbdash` has a connection pool and manage all the connections
itself. The connection pool is initialized as soon as you execute the module.
You should never have to worry about connections in rethinkdbdash. Connections are created
Expand Down
2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var Error = require(__dirname+'/error.js');
var PoolMaster = require(__dirname+'/pool_master.js');
var termTypes = require(__dirname+'/protodef.js').Term.TermType;

function r(options) {
function r() {
var self = this;
var _r = function(x) {
return new Term(_r).expr(x);
Expand Down

0 comments on commit f77d2ff

Please sign in to comment.