diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
| commit | bc81ce040ded3fe791ecffb15baa408346afc92a (patch) | |
| tree | 3330fddcffbca7bd8f42f2fa96ded31cdb0430f9 /docs/_plugins/copy_api_dirs.rb | |
| parent | 3ec21f2eee0a322bcb5cce9678a816b012227a61 (diff) | |
| parent | bb6a39a6872fb8e7118c5a402b7b9d67459e9a64 (diff) | |
| download | spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.gz spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.bz2 spark-bc81ce040ded3fe791ecffb15baa408346afc92a.zip | |
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts:
core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala
pom.xml
Diffstat (limited to 'docs/_plugins/copy_api_dirs.rb')
| -rw-r--r-- | docs/_plugins/copy_api_dirs.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb index ef9912c808..431de909cb 100644 --- a/docs/_plugins/copy_api_dirs.rb +++ b/docs/_plugins/copy_api_dirs.rb @@ -26,8 +26,8 @@ if not (ENV['SKIP_API'] == '1' or ENV['SKIP_SCALADOC'] == '1') curr_dir = pwd cd("..") - puts "Running sbt doc from " + pwd + "; this may take a few minutes..." - puts `sbt doc` + puts "Running sbt/sbt doc from " + pwd + "; this may take a few minutes..." + puts `sbt/sbt doc` puts "Moving back into docs dir." cd("docs") |