3/14/2016 6:55:52 PM
transaction
|
3/11/2016 11:05:20 PM
into hierarchical-accounts
Conflicts:
account/pom.xml
account/src/main/java/org/killbill/billing/account/api/DefaultImmutableAccountData.java
account/src/main/java/org/killbill/billing/account/api/user/DefaultAccountUserApi.java
account/src/test/java/org/killbill/billing/account/dao/MockAccountDao.java
api/pom.xml
beatrix/pom.xml
beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoice.java
catalog/pom.xml
currency/pom.xml
entitlement/pom.xml
invoice/pom.xml
invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java
invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
invoice/src/main/java/org/killbill/billing/invoice/model/DefaultInvoice.java
invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceNotificationQListener.java
invoice/src/test/java/org/killbill/billing/invoice/api/user/TestDefaultInvoiceUserApi.java
jaxrs/pom.xml
jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CreditResource.java
jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
junction/pom.xml
overdue/pom.xml
payment/pom.xml
pom.xml
profiles/killbill/pom.xml
profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCredit.java
profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
profiles/killpay/pom.xml
profiles/pom.xml
subscription/pom.xml
tenant/pom.xml
usage/pom.xml
util/pom.xml
|
|
|
3/5/2016 12:52:49 AM
for node apis
|
|
|
|
|
|
|
3/2/2016 10:44:07 PM
make sure listener does not swallow exception so this can be retried by 'main' bus.
|
|
|
|
|
