killbill-memoizeit

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

12/1/2012 1:43:31 AM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: a81d5e7

Tree: eaf458a

Parents: e6979b8

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: …

12/1/2012 12:07:17 AM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: e6979b8

Tree: c62dc76

Parents: ecfc813
8398252

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

11/30/2012 10:08:17 PM

stephane brossier

Commit: 8398252

Tree: 9f25fb7

Parents: 0878325
9f5ba6e

Add endpoint to rebalance CBA on account

11/30/2012 9:25:53 PM

stephane brossier

Commit: 9f5ba6e

Tree: b014e93

Parents: 029a942

Remove dependency on notificationQ when requests are IMM. …

11/30/2012 8:27:54 PM

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

stephane brossier

Commit: 029a942

Tree: fa3584f

Parents: 49c067e

Remove SubscriptionFactory completely

11/30/2012 3:27:29 AM

stephane brossier

Commit: 49c067e

Tree: ed78a52

Parents: f13124f

Refactoring around Subscriptionfactory

11/30/2012 2:16:44 AM

stephane brossier

Commit: f13124f

Tree: 52d335a

Parents: f636598

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

11/30/2012 1:41:26 AM

stephane brossier

Commit: f636598

Tree: 1ae24a6

Parents: 0f4175f
f66db8f

Refactoring for entitlement to remove SubscriptionFactory …

11/29/2012 1:31:10 AM

dependency

stephane brossier

Commit: 0f4175f

Tree: 2877518

Parents: 18c974d

Merge branch 'master' into queues-rework

11/28/2012 8:18:41 PM

stephane brossier

Commit: 18c974d

Tree: c7a71c9

Parents: 057380a
75184b9