poolifier.git
17 months agodocs: spell fix in README.md
Jérôme Benoit [Tue, 6 Jun 2023 21:10:45 +0000 (23:10 +0200)] 
docs: spell fix in README.md

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofix: ensure the least busy strategy only relies on task runtime
Jérôme Benoit [Tue, 6 Jun 2023 20:42:06 +0000 (22:42 +0200)] 
fix: ensure the least busy strategy only relies on task runtime

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agodocs: refine README.md
Jérôme Benoit [Tue, 6 Jun 2023 20:20:49 +0000 (22:20 +0200)] 
docs: refine README.md

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofix: fix ELU computation
Jérôme Benoit [Tue, 6 Jun 2023 20:07:13 +0000 (22:07 +0200)] 
fix: fix ELU computation

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agochore: generate documentation
github-actions[bot] [Tue, 6 Jun 2023 18:45:37 +0000 (18:45 +0000)] 
chore: generate documentation

17 months agoMerge pull request #770 from poolifier/elu-strategy
Jérôme Benoit [Tue, 6 Jun 2023 18:41:30 +0000 (20:41 +0200)] 
Merge pull request #770 from poolifier/elu-strategy

17 months agofix: dynamic pool options change
Jérôme Benoit [Tue, 6 Jun 2023 18:35:21 +0000 (20:35 +0200)] 
fix: dynamic pool options change

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: rename task performance computation methods
Jérôme Benoit [Tue, 6 Jun 2023 18:15:12 +0000 (20:15 +0200)] 
refactor: rename task performance computation methods

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofeat: conditional task performance computation at the worker level
Jérôme Benoit [Tue, 6 Jun 2023 17:56:29 +0000 (19:56 +0200)] 
feat: conditional task performance computation at the worker level

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into elu-strategy
Jérôme Benoit [Tue, 6 Jun 2023 10:36:02 +0000 (12:36 +0200)] 
Merge branch 'master' into elu-strategy

17 months agochore: generate documentation
github-actions[bot] [Mon, 5 Jun 2023 22:00:59 +0000 (22:00 +0000)] 
chore: generate documentation

17 months agodocs: update security scope
Jérôme Benoit [Mon, 5 Jun 2023 21:54:44 +0000 (23:54 +0200)] 
docs: update security scope

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into elu-strategy
Jérôme Benoit [Mon, 5 Jun 2023 20:54:31 +0000 (22:54 +0200)] 
Merge branch 'master' into elu-strategy

17 months agobuild(deps-dev): apply updates
Jérôme Benoit [Mon, 5 Jun 2023 19:27:44 +0000 (21:27 +0200)] 
build(deps-dev): apply updates

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' of github.com:jerome-benoit/poolifier
Jérôme Benoit [Mon, 5 Jun 2023 15:06:34 +0000 (17:06 +0200)] 
Merge branch 'master' of github.com:jerome-benoit/poolifier

17 months agodocs: update benchmarks vs. external pools
Jérôme Benoit [Mon, 5 Jun 2023 15:06:05 +0000 (17:06 +0200)] 
docs: update benchmarks vs. external pools

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
17 months agotest: fix tests
Jérôme Benoit [Mon, 5 Jun 2023 13:54:47 +0000 (15:54 +0200)] 
test: fix tests

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofeat: add ELU tasks accounting
Jérôme Benoit [Mon, 5 Jun 2023 13:41:17 +0000 (15:41 +0200)] 
feat: add ELU tasks accounting

Reference: #768

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agodocs: fix GH project version
Jérôme Benoit [Mon, 5 Jun 2023 12:10:52 +0000 (14:10 +0200)] 
docs: fix GH project version

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: cleanup task usage properties namespace
Jérôme Benoit [Mon, 5 Jun 2023 11:43:24 +0000 (13:43 +0200)] 
refactor: cleanup task usage properties namespace

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agodocs: enhance worker choice strategies description
Jérôme Benoit [Mon, 5 Jun 2023 10:23:23 +0000 (12:23 +0200)] 
docs: enhance worker choice strategies description

Reference #766

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agochore: v2.5.3 v2.5.3
Jérôme Benoit [Sun, 4 Jun 2023 14:15:48 +0000 (16:15 +0200)] 
chore: v2.5.3

17 months agochore: generate documentation
github-actions[bot] [Sun, 4 Jun 2023 14:13:24 +0000 (14:13 +0000)] 
chore: generate documentation

17 months agochore: generate documentation
github-actions[bot] [Sun, 4 Jun 2023 14:10:36 +0000 (14:10 +0000)] 
chore: generate documentation

17 months agobuild(deps-dev): apply update
Jérôme Benoit [Sun, 4 Jun 2023 14:08:51 +0000 (16:08 +0200)] 
build(deps-dev): apply update

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agochore: generate documentation
github-actions[bot] [Sun, 4 Jun 2023 14:07:22 +0000 (14:07 +0000)] 
chore: generate documentation

17 months agorefactor: factor out pool fullness detection
Jérôme Benoit [Sun, 4 Jun 2023 13:53:23 +0000 (15:53 +0200)] 
refactor: factor out pool fullness detection

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: limit pool internals public exposure
Jérôme Benoit [Sun, 4 Jun 2023 11:18:43 +0000 (13:18 +0200)] 
refactor: limit pool internals public exposure

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: limit pool internals public exposure
Jérôme Benoit [Sun, 4 Jun 2023 11:02:35 +0000 (13:02 +0200)] 
refactor: limit pool internals public exposure

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agodocs: small refinements
Jérôme Benoit [Sun, 4 Jun 2023 10:36:43 +0000 (12:36 +0200)] 
docs: small refinements

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
17 months agorefactor: cleanup enums namespace
Jérôme Benoit [Sat, 3 Jun 2023 21:08:23 +0000 (23:08 +0200)] 
refactor: cleanup enums namespace

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: imports cleanup
Jérôme Benoit [Sat, 3 Jun 2023 11:16:10 +0000 (13:16 +0200)] 
refactor: imports cleanup

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: cleanup
Jérôme Benoit [Sat, 3 Jun 2023 09:55:17 +0000 (11:55 +0200)] 
refactor: cleanup

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: improve queue test
Jérôme Benoit [Sat, 3 Jun 2023 09:44:01 +0000 (11:44 +0200)] 
test: improve queue test

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: improve queue test
Jérôme Benoit [Sat, 3 Jun 2023 09:22:58 +0000 (11:22 +0200)] 
test: improve queue test

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: cleanup worker import
Jérôme Benoit [Sat, 3 Jun 2023 07:51:14 +0000 (09:51 +0200)] 
refactor: cleanup worker import

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: add kill behavior testing
Jérôme Benoit [Sat, 3 Jun 2023 07:16:11 +0000 (09:16 +0200)] 
test: add kill behavior testing

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: convert helper to arrow function
Jérôme Benoit [Fri, 2 Jun 2023 23:01:06 +0000 (01:01 +0200)] 
refactor: convert helper to arrow function

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofeat: expose worker type in pool information
Jérôme Benoit [Fri, 2 Jun 2023 20:35:04 +0000 (22:35 +0200)] 
feat: expose worker type in pool information

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agochore: v2.5.2
Jérôme Benoit [Fri, 2 Jun 2023 15:45:51 +0000 (17:45 +0200)] 
chore: v2.5.2

17 months agochore: generate documentation
github-actions[bot] [Fri, 2 Jun 2023 15:33:24 +0000 (15:33 +0000)] 
chore: generate documentation

17 months agoMerge branch 'master' of github.com:poolifier/poolifier
Jérôme Benoit [Fri, 2 Jun 2023 15:30:11 +0000 (17:30 +0200)] 
Merge branch 'master' of github.com:poolifier/poolifier

17 months agofeat: expose pool information
Jérôme Benoit [Fri, 2 Jun 2023 15:28:54 +0000 (17:28 +0200)] 
feat: expose pool information

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agochore: generate documentation
github-actions[bot] [Fri, 2 Jun 2023 12:26:50 +0000 (12:26 +0000)] 
chore: generate documentation

17 months agobuild(deps-dev): apply updates
Jérôme Benoit [Fri, 2 Jun 2023 11:49:16 +0000 (13:49 +0200)] 
build(deps-dev): apply updates

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agobuild(deps-dev): apply updates
Jérôme Benoit [Fri, 2 Jun 2023 07:59:50 +0000 (09:59 +0200)] 
build(deps-dev): apply updates

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofeat: improve events emission
Jérôme Benoit [Fri, 2 Jun 2023 07:08:24 +0000 (09:08 +0200)] 
feat: improve events emission

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agochore: v2.5.1 v2.5.1
Jérôme Benoit [Thu, 1 Jun 2023 17:57:12 +0000 (19:57 +0200)] 
chore: v2.5.1

17 months agochore: generate documentation
github-actions[bot] [Thu, 1 Jun 2023 17:36:50 +0000 (17:36 +0000)] 
chore: generate documentation

17 months agobuild(deps-dev): apply updates
Jérôme Benoit [Thu, 1 Jun 2023 17:31:43 +0000 (19:31 +0200)] 
build(deps-dev): apply updates

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofeat: restart worker in case of uncaught error
Jérôme Benoit [Thu, 1 Jun 2023 17:20:00 +0000 (19:20 +0200)] 
feat: restart worker in case of uncaught error

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofeat: allow to disable tasks timeout check in worker
Jérôme Benoit [Thu, 1 Jun 2023 08:31:31 +0000 (10:31 +0200)] 
feat: allow to disable tasks timeout check in worker

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agochore: v2.5.0 v2.5.0
Jérôme Benoit [Wed, 31 May 2023 19:45:11 +0000 (21:45 +0200)] 
chore: v2.5.0

17 months agochore: generate documentation
github-actions[bot] [Wed, 31 May 2023 19:32:19 +0000 (19:32 +0000)] 
chore: generate documentation

17 months agobuild(deps-dev): apply updates
Jérôme Benoit [Wed, 31 May 2023 19:30:12 +0000 (21:30 +0200)] 
build(deps-dev): apply updates

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge pull request #748 from poolifier/interleaved-weighted-round-robin-worker-choice...
Jérôme Benoit [Wed, 31 May 2023 19:24:55 +0000 (21:24 +0200)] 
Merge pull request #748 from poolifier/interleaved-weighted-round-robin-worker-choice-strategy

17 months agorefactor: factor out common code in worker choice strategies
Jérôme Benoit [Wed, 31 May 2023 19:18:18 +0000 (21:18 +0200)] 
refactor: factor out common code in worker choice strategies

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: add IWRR test
Jérôme Benoit [Wed, 31 May 2023 19:13:06 +0000 (21:13 +0200)] 
test: add IWRR test

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agodocs: add changelog entry for IWRR worker choice strategy
Jérôme Benoit [Wed, 31 May 2023 18:36:47 +0000 (20:36 +0200)] 
docs: add changelog entry for IWRR worker choice strategy

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: import RR worker choice strategy expectation
Jérôme Benoit [Wed, 31 May 2023 18:32:08 +0000 (20:32 +0200)] 
test: import RR worker choice strategy expectation

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: add more IWRR testing
Jérôme Benoit [Wed, 31 May 2023 18:27:31 +0000 (20:27 +0200)] 
test: add more IWRR testing

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: remove not relevant test
Jérôme Benoit [Wed, 31 May 2023 17:48:59 +0000 (19:48 +0200)] 
test: remove not relevant test

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: add more IWRR worker choice strategies testing
Jérôme Benoit [Wed, 31 May 2023 17:28:36 +0000 (19:28 +0200)] 
test: add more IWRR worker choice strategies testing

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Wed, 31 May 2023 12:52:42 +0000 (14:52 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agotest: fix run
Jérôme Benoit [Wed, 31 May 2023 12:51:08 +0000 (14:51 +0200)] 
test: fix run

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Wed, 31 May 2023 12:47:59 +0000 (14:47 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agotest: use Set for promises
Jérôme Benoit [Wed, 31 May 2023 12:46:03 +0000 (14:46 +0200)] 
test: use Set for promises

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Wed, 31 May 2023 10:07:35 +0000 (12:07 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agorefactor: methods namespace cleanup
Jérôme Benoit [Wed, 31 May 2023 10:00:32 +0000 (12:00 +0200)] 
refactor: methods namespace cleanup

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofeat: add helper to get the worker wait time in worker choice strategies
Jérôme Benoit [Wed, 31 May 2023 09:31:13 +0000 (11:31 +0200)] 
feat: add helper to get the worker wait time in worker choice strategies
code

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Tue, 30 May 2023 21:15:55 +0000 (23:15 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agorefactor: use simple quote in error string
Jérôme Benoit [Tue, 30 May 2023 21:14:11 +0000 (23:14 +0200)] 
refactor: use simple quote in error string

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Tue, 30 May 2023 20:15:00 +0000 (22:15 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agoMerge branch 'master' of github.com:poolifier/poolifier
Jérôme Benoit [Tue, 30 May 2023 20:01:36 +0000 (22:01 +0200)] 
Merge branch 'master' of github.com:poolifier/poolifier

17 months agobuild(deps-dev): apply updates
Jérôme Benoit [Tue, 30 May 2023 20:00:55 +0000 (22:00 +0200)] 
build(deps-dev): apply updates

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: test for IWRR statistics requirements
Jérôme Benoit [Tue, 30 May 2023 19:54:31 +0000 (21:54 +0200)] 
test: test for IWRR statistics requirements

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Tue, 30 May 2023 19:33:49 +0000 (21:33 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agoMerge pull request #758 from poolifier/waittime
Jérôme Benoit [Tue, 30 May 2023 19:33:33 +0000 (21:33 +0200)] 
Merge pull request #758 from poolifier/waittime

17 months agotest: revert wrong change
Jérôme Benoit [Tue, 30 May 2023 19:04:28 +0000 (21:04 +0200)] 
test: revert wrong change

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: refine worker choice strategies expectation
Jérôme Benoit [Tue, 30 May 2023 18:54:13 +0000 (20:54 +0200)] 
test: refine worker choice strategies expectation

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: improve worker choice strategies testing
Jérôme Benoit [Tue, 30 May 2023 16:34:52 +0000 (18:34 +0200)] 
test: improve worker choice strategies testing

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: improve worker choice strategies testing
Jérôme Benoit [Tue, 30 May 2023 13:08:02 +0000 (15:08 +0200)] 
test: improve worker choice strategies testing

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Tue, 30 May 2023 11:25:39 +0000 (13:25 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agoMerge branch 'master' into waittime
Jérôme Benoit [Tue, 30 May 2023 11:22:34 +0000 (13:22 +0200)] 
Merge branch 'master' into waittime

17 months agorefactor: remove unneeded intermediate variable
Jérôme Benoit [Tue, 30 May 2023 11:18:13 +0000 (13:18 +0200)] 
refactor: remove unneeded intermediate variable

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: workaround an issue
Jérôme Benoit [Tue, 30 May 2023 10:53:10 +0000 (12:53 +0200)] 
test: workaround an issue

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agodocs: add changelog entry
Jérôme Benoit [Tue, 30 May 2023 10:46:56 +0000 (12:46 +0200)] 
docs: add changelog entry

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agorefactor: silence sonar
Jérôme Benoit [Tue, 30 May 2023 10:44:00 +0000 (12:44 +0200)] 
refactor: silence sonar

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Tue, 30 May 2023 10:36:58 +0000 (12:36 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agoMerge branch 'master' into waittime
Jérôme Benoit [Tue, 30 May 2023 10:36:41 +0000 (12:36 +0200)] 
Merge branch 'master' into waittime

17 months agobuild(deps-dev): apply updates
Jérôme Benoit [Tue, 30 May 2023 10:35:27 +0000 (12:35 +0200)] 
build(deps-dev): apply updates

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agotest: adapt for tasks usage wait time introduction
Jérôme Benoit [Tue, 30 May 2023 10:32:41 +0000 (12:32 +0200)] 
test: adapt for tasks usage wait time introduction

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' of github.com:poolifier/poolifier into interleaved-weighted...
Jérôme Benoit [Tue, 30 May 2023 08:54:58 +0000 (10:54 +0200)] 
Merge branch 'master' of github.com:poolifier/poolifier into interleaved-weighted-round-robin-worker-choice-strategy

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' of github.com:poolifier/poolifier into waittime
Jérôme Benoit [Tue, 30 May 2023 08:52:30 +0000 (10:52 +0200)] 
Merge branch 'master' of github.com:poolifier/poolifier into waittime

17 months agorefactor: rename worker choice strategies to sensible names
Jérôme Benoit [Tue, 30 May 2023 08:40:59 +0000 (10:40 +0200)] 
refactor: rename worker choice strategies to sensible names

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agofix: fix build
Jérôme Benoit [Mon, 29 May 2023 21:10:38 +0000 (23:10 +0200)] 
fix: fix build

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy
Jérôme Benoit [Mon, 29 May 2023 21:08:27 +0000 (23:08 +0200)] 
Merge branch 'master' into interleaved-weighted-round-robin-worker-choice-strategy

17 months agoMerge branch 'master' into waittime
Jérôme Benoit [Mon, 29 May 2023 21:08:11 +0000 (23:08 +0200)] 
Merge branch 'master' into waittime

17 months agorefactor: spell fixes
Jérôme Benoit [Mon, 29 May 2023 21:07:10 +0000 (23:07 +0200)] 
refactor: spell fixes

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
17 months agoMerge branch 'master' into waittime
Jérôme Benoit [Mon, 29 May 2023 21:06:11 +0000 (23:06 +0200)] 
Merge branch 'master' into waittime