killbill-aplcache

beatrix: Fix broken test TestWithEntilementPlugin (because …

of 2a9120d4a870bc4e056c59f1637da1955936b577)

Merge branch 'ma-issue-199' of https://github.com/maguero/killbill …

into maguero-ma-issue-199

Conflicts:
	jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
	profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestEntitlement.java

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