Skip to content

Commit

Permalink
Merge pull request #12 from snoweye/master
Browse files Browse the repository at this point in the history
minor
  • Loading branch information
snoweye authored Jan 7, 2017
2 parents 67cf4c0 + 9732b9b commit 3f78dbe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Authors@R: c(person("Wei-Chen", "Chen", role = c("aut", "cre"), email =
person("Philipp", "A.", role = "ctb", comment = "Fedora"))
Depends: R (>= 3.2.0)
Imports: R6
Suggests: pbdRPC, remoter
Enhances: pbdMPI, pbdCS
Suggests: pbdRPC
Enhances: remoter, pbdMPI, pbdCS
LazyLoad: yes
LazyData: yes
Copyright: See files AUTHORS, COPYING, COPYING.LESSER, and MAINTAINERS
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ package vignette.
## Installation

pbdZMQ requires

* R version 3.0.0 or higher.
* Linux, Mac OSX, Windows, or FreeBSD.
* libzmq >= 4.0.4.
Expand All @@ -103,7 +104,7 @@ When mentioning the pbdZMQ, please cite:

```
@MISC{pbdZMQ2015,
author = {Chen, W.-C. and Schmidt, D. and Ostrouchov, G.},
author = {Chen, W.-C. and Schmidt, D. and Heckendorf, C. and Ostrouchov, G.},
title = {pbdZMQ: Programming with Big Data -- Interface to ZeroMQ},
year = {2015},
note = {R Package, URL https://cran.r-project.org/package=pbdZMQ}
Expand All @@ -114,12 +115,14 @@ When mentioning the pbdZMQ, please cite:
## Authors

pbdMPI is authored and maintained by:

* Wei-Chen Chen
* Drew Schmidt
* Christian Heckendorf
* George Ostrouchov

With additional contributions from:

* Whit Armstrong (some functions are modified from rzmq for backwards compatibility)
* Brian Ripley (C code of shellexec)
* The R Core team (some functions are modified from the R source code)
Expand Down

0 comments on commit 3f78dbe

Please sign in to comment.