Merge pull request #527 from ankurdave/graphx-assembly-pom

Add GraphX to assembly/pom.xml

Author: Ankur Dave <ankurdave@gmail.com>

== Merge branch commits ==

commit bb0b33ef9eb1b3d4a4fc283d9abb2ece4abcac23
Author: Ankur Dave <ankurdave@gmail.com>
Date:   Fri Jan 31 15:24:52 2014 -0800

    Add GraphX to assembly/pom.xml
(cherry picked from commit a8cf3ec157fc9a512421b319cfffc5e4f07cf1f3)

Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Merge pull request #524 from rxin/doc

Added spark.shuffle.file.buffer.kb to configuration doc.

Author: Reynold Xin <rxin@apache.org>

== Merge branch commits ==

commit 0eea1d761ff772ff89be234e1e28035d54e5a7de
Author: Reynold Xin <rxin@apache.org>
Date:   Wed Jan 29 14:40:48 2014 -0800

    Added spark.shuffle.file.buffer.kb to configuration doc.
(cherry picked from commit ac712e48af3068672e629cec7766caae3cd77c37)

Signed-off-by: Patrick Wendell <pwendell@gmail.com>