killbill-memoizeit

Merge remote-tracking branch 'origin/bcd_update' into work-for-release-0.17.0 Conflicts: jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/BundleResource.java jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java pom.xml subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.sql.stg subscription/src/test/java/org/killbill/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java

jaxrs: Add endpoint to update the BCD associated with a subscription. …

See #546

beatrix: Add test for BCD change to verify ability to move BCD …

in a way that looks like a restart. See #546

subscription, jaxrs: Add beatrix test for BCD change and fix …

issues. See #546

Initial prototype implementation for changing BCD on a subscription …

level. See #546

pom.xml: update to latest platform (Guice bug workaround) Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

Merge branch 'fix-for-477' into work-for-release-0.16.6

profile: Fix TestEntitlement (hack until java client gets …

released)

jaxrs, catalog: Fixes #531

jaxrs: Fix equals method for PhasePriceOverrideJson