killbill-aplcache

entitlement: fix regression in bundle timeline API After …

the recent optimization iterations, the timeline
API was broken and didn't return blocking states for
non-entitlement services anymore.

This patch fixes it and optimizes the entitlement code a bit further
by limiting the amount of DAO calls in blocking states.

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

Merge branch 'junction-bug-fixes' of github.com:killbill/killbill …

into junction-bug-fixes

Code review integration for default sql ordering

Fixes #132 (Also fixes the bug introduced during the perf …

optimization in subscription base where events are retrieved by account_record_id and where
ordering by effective_date, record_id must be enforced)

beatrix: fix ClassCastException Reported-by: Nitin Singh …

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

Merge remote-tracking branch 'origin/master' into junction-bug-fixes Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/dao/ProxyBlockingStateDao.java Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

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

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

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

server: fix tests failures after recent changes Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>