diff options
author | Patrick Wendell <pwendell@gmail.com> | 2013-08-21 15:34:31 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2013-08-21 15:34:31 -0700 |
commit | 6be6b71c8cf9f8033e0a5cc8e00fbb2ed4ab778c (patch) | |
tree | 549bcd4d4ed258fb8df4e4b6737620be61d6e734 /docs/_plugins/copy_api_dirs.rb | |
parent | 51a1a0c602481620dd914f3024dee52c3312058d (diff) | |
parent | 2905611c139e6e014ee4679a2d59f763c515d6f0 (diff) | |
download | spark-6be6b71c8cf9f8033e0a5cc8e00fbb2ed4ab778c.tar.gz spark-6be6b71c8cf9f8033e0a5cc8e00fbb2ed4ab778c.tar.bz2 spark-6be6b71c8cf9f8033e0a5cc8e00fbb2ed4ab778c.zip |
Merge branch 'master' into ec2-updates
Conflicts:
ec2/spark_ec2.py
Diffstat (limited to 'docs/_plugins/copy_api_dirs.rb')
-rw-r--r-- | docs/_plugins/copy_api_dirs.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb index 45ef4bba82..217254c59f 100644 --- a/docs/_plugins/copy_api_dirs.rb +++ b/docs/_plugins/copy_api_dirs.rb @@ -20,7 +20,7 @@ include FileUtils if ENV['SKIP_API'] != '1' # Build Scaladoc for Java/Scala - projects = ["core", "examples", "repl", "bagel", "streaming"] + projects = ["core", "examples", "repl", "bagel", "streaming", "mllib"] puts "Moving to project root and building scaladoc." curr_dir = pwd |