Merge pull request #3253 from majianpeng/bug-fix

author Samuel Just <sam.just@inktank.com>

Fri, 29 May 2015 17:31:21 +0000 (10:31 -0700)

committer Samuel Just <sam.just@inktank.com>

Fri, 29 May 2015 17:31:21 +0000 (10:31 -0700)
author Samuel Just <sam.just@inktank.com>
Fri, 29 May 2015 17:31:21 +0000 (10:31 -0700)
committer Samuel Just <sam.just@inktank.com>
Fri, 29 May 2015 17:31:21 +0000 (10:31 -0700)
diff --cc src/os/WBThrottle.cc
Simple merge
diff --cc src/os/WBThrottle.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Fri, 29 May 2015 17:31:21 +0000 (10:31 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 29 May 2015 17:31:21 +0000 (10:31 -0700)
		1	2
src/os/WBThrottle.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/WBThrottle.h	patch \|	diff1 \|	diff2 \|	blob \| history