Merge pull request #6 from apache/master

merge upstream changes
Merge branch 'master' of github.com:nchammas/spark
Merge pull request #1 from apache/master

merge upstream changes
Merge branch 'master' of github.com:nchammas/spark
Merge pull request #2 from apache/master

merge upstream changes
Merge pull request #3 from apache/master

merge upstream changes
Merge pull request #4 from apache/master

merge upstream changes
Merge pull request #5 from apache/master

merge upstream changes
Merge pull request #6 from apache/master

merge upstream changes
Merge pull request #7 from apache/master

merge upstream changes
Merge pull request #8 from apache/master

merge upstream changes
Merge pull request #9 from apache/master

merge upstream changes
Merge pull request #10 from apache/master

merge upstream changes
Merge pull request #11 from apache/master

merge upstream changes
Merge pull request #12 from apache/master

merge upstream changes
Merge pull request #13 from apache/master

merge upstream changes
Merge pull request #14 from apache/master

merge upstream changes
Merge pull request #15 from apache/master

merge upstream changes
Indent license header properly for interfaces.scala.

A very small nit update.

Author: Reynold Xin <rxin@databricks.com>

Closes #3552 from rxin/license-header and squashes the following commits:

df8d1a4 [Reynold Xin] Indent license header properly for interfaces.scala.
[SPARK-4536][SQL] Add sqrt and abs to Spark SQL DSL

Spark SQL has embeded sqrt and abs but DSL doesn't support those functions.

Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp>

Closes #3401 from sarutak/dsl-missing-operator and squashes the following commits:

07700cf [Kousuke Saruta] Modified Literal(null, NullType) to Literal(null) in DslQuerySuite
8f366f8 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into dsl-missing-operator
1b88e2e [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into dsl-missing-operator
0396f89 [Kousuke Saruta] Added sqrt and abs to Spark SQL DSL