killbill-memoizeit

Merge branch 'work-for-release-0.17.0' of github.com:killbill/killbill …

3/14/2016 9:47:25 PM

into work-for-release-0.17.0

stephane brossier

Commit: 18b86a0

Tree: eedf8be

Parents: 775ac6f
adff023

Merge branch 'work-for-release-0.16.3' into work-for-release-0.17.0

3/14/2016 9:47:00 PM

stephane brossier

Commit: 775ac6f

Tree: eedf8be

Parents: a20e22c
b6a2b8f

Merge branch 'work-for-release-0.16.3' of github.com:killbill/killbill …

3/14/2016 7:05:22 PM

into work-for-release-0.16.3

stephane brossier

Commit: b6a2b8f

Tree: ffd2e3d

Parents: 2369e9a
3ddc597

payment: Add tests to verify retring a failed transaction (PAYMENT_FAILURE|PLUGIN_FAILURE) …

3/14/2016 7:04:53 PM

with same external key works as expected both from raw payment api or attempt level

stephane brossier

Commit: 2369e9a

Tree: aa7f632

Parents: 86ebbcb

payment: Variable renaming + add ability to simulate CANCELED …

3/14/2016 6:55:52 PM

transaction

stephane brossier

Commit: 86ebbcb

Tree: 9bd371a

Parents: 1c82baf

Merge remote-tracking branch 'origin/work-for-release-0.17.0' …

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