killbill-aplcache

meter: fix failing TestTimelineAggregator test Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Merge remote-tracking branch 'origin/master' into meter Conflicts: overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java util/src/test/java/com/ning/billing/util/notificationq/dao/TestNotificationSqlDao.java Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Merge branch 'master' into usertoken Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/DefaultEntitlementDao.java invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java util/src/main/java/com/ning/billing/util/notificationq/DefaultNotificationQueue.java util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java

Add endpoint to rebalance CBA on account

Remove dependency on notificationQ when requests are IMM. …

That way we can lower the poll interval to something bigger and reduce load on database.

Remove SubscriptionFactory completely

Refactoring around Subscriptionfactory

Merge branch 'master' into queues-rework-low-latency Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/api/svcs/DefaultEntitlementInternalApi.java

Refactoring for entitlement to remove SubscriptionFactory …

dependency

Merge branch 'master' into queues-rework