killbill-memoizeit

Merge remote-tracking branch 'origin/master' into ma-issue-199 Conflicts: pom.xml

#199: Modify EntitlementContext to pass a list of List<EntitlementSpecifier> …

to reflect the multiple subscriptions.

#199: Extracting externalKey because is at the bundle level …

and therefore should not be contained in the EntitlementSpecifier.

Merge remote-tracking branch 'origin/master' into ma-issue-199 Conflicts: entitlement/src/test/java/org/killbill/billing/entitlement/api/TestDefaultEntitlementApi.java jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java pom.xml

#199, pull/426: adding JAXRS test for createEntitlementWithAddOns

Adding a Beatrix level tests to test the new EntitlementAPI …

and verify that we indeed get only ONE invoice created with all the invoice items.

Fixing some typos and minor changes for PR https://github.com/killbill/killbill/pull/426

Combo call to create subscriptions with add-ons. #199

Merge branch 'master' of github.com:killbill/killbill

Merge pull request #434 from maguero/ma-issue-315 #315 …

: allow users to ONLY specify the bundleExternalKey instead of b…