Merge branch 'trunk' of https://github.com/apache/roller into trunk
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/f6e3764e Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/f6e3764e Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/f6e3764e Branch: refs/heads/bootstrap-ui Commit: f6e3764e7fd1d311da6af98e982a9ac002152d3b Parents: 00bfff9 3a3c969 Author: Dave Johnson <[email protected]> Authored: Tue Nov 24 17:17:26 2015 -0500 Committer: Dave Johnson <[email protected]> Committed: Tue Nov 24 17:17:26 2015 -0500 ---------------------------------------------------------------------- .../org/apache/roller/util/RollerConstants.java | 3 +++ .../roller/weblogger/business/HitCountQueue.java | 5 ++--- .../business/runnable/TaskScheduler.java | 18 ++++++++++++++---- .../business/runnable/ThreadManagerImpl.java | 17 ++++++++++++++++- 4 files changed, 35 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
