Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'upstream/master'

Conflicts:
	bin/scala-bootstrapper
  • Loading branch information...
commit 8aac5ff7e6f83c5f3fcfdafae37fa389bb046fc5 2 parents 35a1233 + 191f930
@jaked authored
Showing with 4 additions and 4 deletions.
  1. +3 −3 bin/scala-bootstrapper
  2. +1 −1  lib/template/src/scripts/startup.sh
View
6 bin/scala-bootstrapper
@@ -69,7 +69,7 @@ if git
sys('touch README.md')
sys('git add .')
sys("git commit -m'first commit'")
- sys('git co -b scala-bootstrapper')
+ sys('git checkout -b scala-bootstrapper')
else
if `git status -s` != ''
@@ -77,9 +77,9 @@ if git
end
$branch = `git branch`.grep(/^\*/).first.chomp.gsub(/^\* (.+)$/, '\1')
- if !sys('git co scala-bootstrapper', false)
+ if !sys('git checkout scala-bootstrapper', false)
$ex_post_facto = true
- sys('git co -b scala-bootstrapper')
+ sys('git checkout -b scala-bootstrapper')
end
end
end
View
2  lib/template/src/scripts/startup.sh
@@ -87,7 +87,7 @@ case "$1" in
exit 0
fi
- curl -s http://localhost:${ADMIN_PORT}/shutdown.txt > /dev/null
+ curl -m 5 -s http://localhost:${ADMIN_PORT}/shutdown.txt > /dev/null
tries=0
while running; do
tries=$((tries + 1))
Please sign in to comment.
Something went wrong with that request. Please try again.