killbill-memoizeit

account: remove unused billing_cycle_day_utc column Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

entitlement: fix potential NPE in DefaultSubscription getBaseSubscription() …

is null for e.g. standalone subscriptions.

This fixes #143.

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

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

[maven-release-plugin] prepare for next development iteration

[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