Permalink
Browse files

Merge branch 'master' of github.com:twitter/scala-bootstrapper

Conflicts:
	lib/template/project/build/BirdNameProject.scala.erb
	lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceImpl.scala.erb
	lib/template/src/scripts/startup.sh
	lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb
  • Loading branch information...
2 parents 775b68b + 4550688 commit ddfd1f3b3a6b82ac975e0f89064ce3d10b6599d6 Robey Pointer committed Mar 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/template/TUTORIAL.md
View
2 lib/template/TUTORIAL.md
@@ -76,7 +76,7 @@ Ostrich also stores historial stats data and can build
You can ask the server to shutdown over the admin port also:
- $ curl localhost:9990/shutdown.txt
+ $ curl localhost:9900/shutdown.txt
ok
### View the implementation of get() and put()

0 comments on commit ddfd1f3

Please sign in to comment.