Remove outdated comment
Merge branch 'reql_admin' into michel_2879_reql_admin
Replace number of shards with version in server/server
Use Promise.reject
Ctrl+tab should switch tab on Firefox 31 - #2959
Ctrl+tab should switch tab on Firefox 31 - #2959
preventDeafault when closing popup on the dashboard
Have getField show in the suggestions
Adds the machine name and UUID to the "Server ready" message
Enforce that the callback must be a function or undefined in run
Take deleted or conflicted names into account
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Fix typo - missing bracket
Typo -- also fix test
Changes the `rcheck` and `rfail` series of macros to use the same argument order
Add tests for pseudotypes to json tests

Over the shoulder from @Tryneus.
Working on ripping out cfeed_func.
Move stats query in the views
Things compile again.
Refactor server/server to follow other views' structures