killbill-memoizeit

<< < 595 596 597 598 599 > >>

First level payment integration in beatrix test

2/10/2012 6:29:56 PM

stephane brossier

Commit: b82761a

Parents: 13a0693

Merge branch 'master' of github.com:ning/killbill into fixed-price Conflicts: invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java invoice/src/main/java/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.java invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceItemSqlDao.sql.stg fixed …

2/13/2012 3:08:02 PM

price changes

Jeff Certain

Commit: 39dc067

Parents: 5d66b62

Merge branch 'master' of github.com:ning/killbill into fixed-price

2/10/2012 4:35:59 PM

Jeff Certain

Commit: 5d66b62

Parents: 1932731
13a0693

Revert beatrix catalog to use fixed price

2/10/2012 4:35:19 PM

stephane brossier

Commit: 13a0693

Parents: 3e765e3

Merge branch 'master' of github.com:ning/killbill into fixed-price Conflicts: invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java invoice/src/main/java/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.java invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceItemSqlDao.sql.stg

2/10/2012 4:35:38 PM

Jeff Certain

Commit: 1932731

Parents: 5d72524
3e765e3

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

2/9/2012 11:28:21 PM

stephane brossier

Commit: 3e765e3

Parents: f9f3d30
fbf497b

Created payment service for event bus registration

2/9/2012 5:16:34 AM

alena

Commit: fbf497b

Parents: 6bc19df

Add global locking (account) for invoice subsystem

2/9/2012 11:27:48 PM

stephane brossier

Commit: f9f3d30

Parents: 6bc19df

Merge branch 'inv-ent-integration' Not so trivial merge Conflicts: analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadMockEntitlementDao.java entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModuleSql.java invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java util/src/main/java/com/ning/billing/util/notificationq/DefaultNotificationQueue.java util/src/main/java/com/ning/billing/util/notificationq/DefaultNotificationQueueService.java util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java

2/8/2012 8:35:28 PM

stephane brossier

Commit: 6bc19df

Parents: 698fa25
275a4e5

Move to latest and greatest JDBI version

2/7/2012 11:20:53 PM

stephane brossier

Commit: 275a4e5

Parents: b9e6491