killbill-memoizeit

<< < 42 43 44 45 46 > >>

jaxrs: Fix equals method for PhasePriceOverrideJson

5/24/2016 7:36:04 PM

stephane brossier

Commit: e276090

Tree: fecb5db

Parents: 07f3ad7

jaxrs: Fixes issue #530 Populate the priceOverrides fields …

5/24/2016 7:19:00 PM

from the Subscription model to access overridden price catalog info.

stephane brossier

Commit: 07f3ad7

Tree: d754d69

Parents: f3e80f2

Add migration files for HA feature

6/17/2016 9:42:41 PM

stephane brossier

Commit: ec02e82

Tree: 328e781

Parents: 57204c0

Merge branch 'hierarchical-accounts' of github.com:killbill/killbill …

5/25/2016 5:09:19 PM

into hierarchical-accounts

Conflicts:
	invoice/src/test/java/org/killbill/billing/invoice/api/user/TestDefaultInvoiceUserApi.java
	invoice/src/test/java/org/killbill/billing/invoice/dao/MockInvoiceDao.java

stephane brossier

Commit: 57204c0

Tree: 1284f30

Parents: e5b49fd
bc33d01

Merge branch 'work-for-release-0.17.0' into hierarchical-accounts

5/6/2016 11:12:15 PM

stephane brossier

Commit: bc33d01

Tree: 80e9a92

Parents: 5f9dfac
1f18602

Merge branch 'work-for-release-0.17.0' into hierarchical-accounts

5/6/2016 8:33:52 PM

stephane brossier

Commit: 5f9dfac

Tree: eab1045

Parents: ba0e30f
3379f01

Fix merge issue (compilation error)

5/6/2016 6:52:17 PM

stephane brossier

Commit: ba0e30f

Tree: d19e9cd

Parents: 94a34fb

Merge issue (forgot flywaydb dep)

5/6/2016 5:52:20 PM

stephane brossier

Commit: 94a34fb

Tree: 060be9b

Parents: 7d4841d

Merge branch 'work-for-release-0.17.0' into hierarchical-accounts Conflicts: account/pom.xml api/pom.xml beatrix/pom.xml 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/dao/InvoiceDao.java invoice/src/test/java/org/killbill/billing/invoice/api/user/TestDefaultInvoiceUserApi.java invoice/src/test/java/org/killbill/billing/invoice/dao/MockInvoiceDao.java jaxrs/pom.xml junction/pom.xml overdue/pom.xml payment/pom.xml payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java pom.xml profiles/killbill/pom.xml 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

5/6/2016 5:38:21 PM

stephane brossier

Commit: 7d4841d

Tree: 0ef421c

Parents: 3ff7d23
f8e52ea

Merge branch 'work-for-release-0.17.0' into hierarchical-accounts Conflicts: account/pom.xml api/pom.xml beatrix/pom.xml catalog/pom.xml currency/pom.xml entitlement/pom.xml invoice/pom.xml invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java invoice/src/test/java/org/killbill/billing/invoice/api/user/TestDefaultInvoiceUserApi.java invoice/src/test/java/org/killbill/billing/invoice/dao/MockInvoiceDao.java jaxrs/pom.xml junction/pom.xml overdue/pom.xml payment/pom.xml payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java pom.xml profiles/killbill/pom.xml 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

5/25/2016 3:49:05 PM

stephane brossier

Commit: e5b49fd

Tree: 155d11d

Parents: 3ff7d23
c68f196