Permalink
Browse files

Merge branch 'github_master'

Conflicts:
	loadtest/project/Build.scala
	project/Build.scala
  • Loading branch information...
2 parents b5e007d + 6f74c3e commit 173e5b0b631d01e9c01f892d32b4327ec50d9eeb Stephan Zuercher committed Sep 24, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 ChangeLog
View
@@ -15,6 +15,7 @@ release: TBD
2.3.3
-----
+- track queue item add time and compute duration on request
- change kestrel.sh to use old PID file so that daemon-based installs can
be halted

0 comments on commit 173e5b0

Please sign in to comment.