killbill-memoizeit

[maven-release-plugin] prepare release killbill-0.8.5

NEWS: update for 0.8.5 Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

entitlement: update to latest killbill-oss-parent This …

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

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

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

Fix an issue with how we report paidAmount when there were some …

incomplete refunds.

The refund amount should only be substracted of the payment amount when its status is COMPLETED.

Merge branch 'master' of github.com:killbill/killbill Conflicts: entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultSubscriptionApi.java

Add comment in test (code review integration)

entitlement: mark PAUSE/RESUME billing events as billing-service …

events

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

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

entitlement: remove TIMELINE_WARN_LOG I couldn't find …

any occurrence in production logs for
blocking states, but this may be common for subscription
base events (changes in the same day). For the latter use case,
we trust createdDate as a proxy.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Merge remote-tracking branch 'origin/master'