killbill-aplcache

Merge remote-tracking branch 'origin/master' into alpha Conflicts: pom.xml

payment: fix typo in error message Signed-off-by: Pierre-Alexandre …

Meyer <pierre@mouraf.org>

payment: code review integration Signed-off-by: Pierre-Alexandre …

Meyer <pierre@mouraf.org>

payment: avoid double dispatching in DefaultPaymentGatewayApi Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

util: bump default of org.killbill.payment.plugin.threads.nb …

to 100

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

payment: trivial cleanups Signed-off-by: Pierre-Alexandre …

Meyer <pierre@mouraf.org>

payment: remove confusing comment in PaymentGatewayProcessor While …

it's true that we don't take any lock, the calls are always re-entrant-safe,
even with if the lock were to be taken.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

payment: set timeout for control operations in DefaultPaymentGatewayApi This …

fixes https://github.com/killbill/killbill/issues/391.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

payment: fix for control plugins * DefaultPaymentGatewayApi …

wasn't respecting the overridden payment method id
* ControlPluginRunner wasn't respecting previous overrides in case of multiple chained control plugins

This fixes https://github.com/killbill/killbill/issues/441.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Use latest oss pom released version