Reynold Xin 9c35f02b35 [SPARK-7462] By default retain group by columns in aggregate ... Updated Java, Scala, Python, and R. Author: Reynold Xin <rxin@databricks.com> Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu> Closes #5996 from rxin/groupby-retain and squashes the following commits: aac7119 [Reynold Xin] Merge branch 'groupby-retain' of github.com:rxin/spark into groupby-retain f6858f6 [Reynold Xin] Merge branch 'master' into groupby-retain 5f923c0 [Reynold Xin] Merge pull request #15 from shivaram/sparkr-groupby-retrain c1de670 [Shivaram Venkataraman] Revert workaround in SparkR to retain grouped cols Based on reverting code added in commit 9a6be746ef b8b87e1 [Reynold Xin] Fixed DataFrameJoinSuite. d910141 [Reynold Xin] Updated rest of the files 1e6e666 [Reynold Xin] [SPARK-7462] By default retain group by columns in aggregate (cherry picked from commit 0a4844f90a) Signed-off-by: Reynold Xin <rxin@databricks.com>		2015-05-11 11:35:35 -07:00
..
inst	[SPARK-7231] [SPARKR] Changes to make SparkR DataFrame dplyr friendly.	2015-05-08 18:30:10 -07:00
R	[SPARK-7462] By default retain group by columns in aggregate	2015-05-11 11:35:35 -07:00
src	[SPARK-5654] Integrate SparkR	2015-04-08 22:45:40 -07:00
tests	[SPARK-5654] Integrate SparkR	2015-04-08 22:45:40 -07:00
DESCRIPTION	[SPARK-6824] Fill the docs for DataFrame API in SparkR	2015-05-08 11:25:20 -07:00
NAMESPACE	[SPARK-7231] [SPARKR] Changes to make SparkR DataFrame dplyr friendly.	2015-05-08 18:30:10 -07:00