diff options
| author | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-04-16 13:06:34 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-04-16 13:06:34 -0700 |
| commit | 55f553a979db925aa0c3559f7e80b99d2bf3feb4 (patch) | |
| tree | 1014a4731dac7ef43934c14938b7a47b2b186fba /R/pkg/DESCRIPTION | |
| parent | ef3fb801ae971656ed9cd1b0ab95bc5a1548adbd (diff) | |
| download | spark-55f553a979db925aa0c3559f7e80b99d2bf3feb4.tar.gz spark-55f553a979db925aa0c3559f7e80b99d2bf3feb4.tar.bz2 spark-55f553a979db925aa0c3559f7e80b99d2bf3feb4.zip | |
[SPARK-6855] [SPARKR] Set R includes to get the right collate order.
This prevents tools like devtools::document creating invalid collate orders
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #5462 from shivaram/collate-order and squashes the following commits:
f3db562 [Shivaram Venkataraman] Set R includes to get the right collate order. This prevents tools like devtools::document creating invalid collate orders
Diffstat (limited to 'R/pkg/DESCRIPTION')
| -rw-r--r-- | R/pkg/DESCRIPTION | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION index 1842b97d43..052f68c6c2 100644 --- a/R/pkg/DESCRIPTION +++ b/R/pkg/DESCRIPTION @@ -17,19 +17,19 @@ License: Apache License (== 2.0) Collate: 'generics.R' 'jobj.R' - 'SQLTypes.R' 'RDD.R' 'pairRDD.R' + 'SQLTypes.R' 'column.R' 'group.R' 'DataFrame.R' 'SQLContext.R' + 'backend.R' 'broadcast.R' + 'client.R' 'context.R' 'deserialize.R' 'serialize.R' 'sparkR.R' - 'backend.R' - 'client.R' 'utils.R' 'zzz.R' |