killbill-aplcache

<< < 30 31 32 33 34 > >>

Merge remote branch 'origin/integration' into server Conflicts: payment/src/main/java/com/ning/billing/payment/RequestProcessor.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java payment/src/main/java/com/ning/billing/payment/provider/NoOpPaymentProviderPlugin.java payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

5/22/2012 8:38:44 PM

stephane brossier

Commit: 3b35903

Parents: 5bd7ec7
4095f4c

Merging with integration

5/18/2012 5:37:05 PM

Martin Westhead

Commit: 4095f4c

Parents: 5311025
6bc860a

Setting up for Overdue NUTS tests

5/17/2012 4:58:03 PM

Martin Westhead

Commit: 5311025

Parents: bcac4cf

Another fix to get the conditional logic for the state calculation …

5/12/2012 4:18:01 PM

correct

Martin Westhead

Commit: bcac4cf

Parents: 1b8b370

Moving the payment event posting deeper in the stack so that …

5/12/2012 4:03:53 PM

it (hopefully) occurs for all payments, howver initiated

Martin Westhead

Commit: 1b8b370

Parents: 9527678

Various fixes to overdue to get a beatrix test working end-to-end. …

5/12/2012 3:25:08 PM

Last piece still to do - recovery after payment goes through.

Martin Westhead

Commit: 9527678

Parents: b9f7e1b

Various fixes to overdue to get a beatrix test working end-to-end. …

5/12/2012 3:24:53 PM

Last piece still to do - recovery after payment goes through.

Martin Westhead

Commit: b9f7e1b

Parents: 2e1778e

Fix build issues after payment changes

5/22/2012 3:34:05 PM

stephane brossier

Commit: 5bd7ec7

Parents: 5ac8a83

Fix unit tests after dreadfl merge operation

5/16/2012 8:04:53 PM

stephane brossier

Commit: 5ac8a83

Parents: 6933c5b

Merge remote branch 'origin/integration' into server Conflicts: analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java api/src/main/java/com/ning/billing/payment/api/PaymentApi.java api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java beatrix/src/test/java/com/ning/billing/beatrix/integration/payment/TestNotifyInvoicePaymentApi.java payment/src/main/java/com/ning/billing/payment/RequestProcessor.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java payment/src/main/java/com/ning/billing/payment/dao/AuditedPaymentDao.java payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java payment/src/main/java/com/ning/billing/payment/provider/NoOpPaymentProviderPlugin.java payment/src/main/java/com/ning/billing/payment/retry/TimedoutPaymentRetryService.java payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg payment/src/main/resources/com/ning/billing/payment/ddl.sql payment/src/test/java/com/ning/billing/payment/TestRetryService.java payment/src/test/java/com/ning/billing/payment/api/TestEventJson.java payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java payment/src/test/java/com/ning/billing/payment/dao/MockPaymentDao.java payment/src/test/java/com/ning/billing/payment/dao/TestPaymentDao.java payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

5/16/2012 2:08:26 PM

stephane brossier

Commit: 6933c5b

Parents: 3be9e53
6bc860a