killbill-developers

Merge branch 'work-for-release-0.19.x' of github.com:killbill/killbill …

into work-for-release-0.19.x

Merge pull request #721 from beccagaspard/718-catalog-plugin-api-usage-support Issue …

#718 - add support for usage section when using catalog plugin api

Issue #718 - add support for usage section when using catalog …

plugin api.

Merge branch 'master' into work-for-release-0.19.x Conflicts: pom.xml

Merge branch 'master' of github.com:killbill/killbill

payment: set keys as the id for invoice payments See https://github.com/killbill/killbill/issues/349. Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

payment: avoid NPE if a control plugin returns null objects Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

payment: set keys as the id by default when going through control …

plugins

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

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

Fix usage of deprecated Guava APIs This will help us with upgrades …

in the future.

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

invoice: avoid recomputing the CBA if there are no new items …

from the plugins

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