Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'apache/master' into maven-tests
Conflicts:
	dev/run-tests-jenkins
  • Loading branch information
pwendell committed Aug 27, 2015
commit cf58c49c3be31c8e33639ba68eca16398f98c7f6
4 changes: 2 additions & 2 deletions dev/run-tests-jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ COMMIT_URL="https://github.com/apache/spark/commit/${ghprbActualCommit}"
SHORT_COMMIT_HASH="${ghprbActualCommit:0:7}"

# format: http://linux.die.net/man/1/timeout
# must be less than the timeout configured on Jenkins (currently 205m)
TESTS_TIMEOUT="200m"
# must be less than the timeout configured on Jenkins (currently 300m)
TESTS_TIMEOUT="250m"

# Array to capture all tests to run on the pull request. These tests are held under the
#+ dev/tests/ directory.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.