killbill-developers

<< < 24 25 26 27 28 > >>

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: invoice/src/test/java/com/ning/billing/invoice/MockModule.java invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java

10/6/2012 1:25:32 AM

stephane brossier

Commit: d2c8bbe

Parents: 5c0ad52
82ca1c0

Fixing issues with tenants

10/6/2012 1:22:46 AM

stephane brossier

Commit: 5c0ad52

Parents: 47472c4

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: invoice/src/main/java/com/ning/billing/invoice/notification/EmailInvoiceNotifier.java junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingEntitlementUserApi.java util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java

10/6/2012 1:09:22 AM

stephane brossier

Commit: 47472c4

Parents: 7b14247
6316841

Partial checkin to merge from svcapi

10/6/2012 12:56:11 AM

stephane brossier

Commit: 7b14247

Parents: 40387d0

Partial checkin to merge from svcapi

10/6/2012 12:55:14 AM

stephane brossier

Commit: 40387d0

Parents: 1a5fd8e

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java invoice/src/main/java/com/ning/billing/invoice/dao/AuditedInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/api/invoice/TestDefaultInvoicePaymentApi.java invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java invoice/src/test/java/com/ning/billing/invoice/dao/TestDefaultInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/tests/TestChargeBacks.java junction/src/test/java/com/ning/billing/junction/api/blocking/TestDefaultBlockingApi.java overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java payment/src/main/java/com/ning/billing/payment/core/PaymentProcessor.java payment/src/main/java/com/ning/billing/payment/core/ProcessorBase.java payment/src/main/java/com/ning/billing/payment/core/RefundProcessor.java payment/src/test/java/com/ning/billing/payment/core/TestPaymentMethodProcessor.java

10/5/2012 9:47:00 PM

stephane brossier

Commit: 1a5fd8e

Parents: c08a623
6d03324

Add default implementation for internal APIs

10/5/2012 9:35:17 PM

stephane brossier

Commit: c08a623

Parents: 8f2c83e

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java

10/5/2012 7:57:54 PM

stephane brossier

Commit: 8f2c83e

Parents: abff2c7
6014158

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java invoice/src/main/java/com/ning/billing/invoice/dao/AuditedInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/dao/TestDefaultInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/dao/TestInvoiceDao.java junction/src/main/java/com/ning/billing/junction/api/blocking/DefaultBlockingApi.java overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java

10/5/2012 7:56:44 PM

stephane brossier

Commit: abff2c7

Parents: a1e038c
12806d9

Second pass on remove user api from killbill code

10/5/2012 7:01:28 PM

stephane brossier

Commit: a1e038c

Parents: b66d291