killbill-aplcache

<< < 10 11 12 13 14 > >>

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

11/4/2015 6:34:35 PM

Matias Aguero

Commit: 7eb9e14

Tree: d000c81

Parents: 9e97f83
d82926a

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

11/2/2015 11:06:26 AM

Matias Aguero

Commit: 9e97f83

Tree: a15eeac

Parents: a7d2a2e

Adding a Beatrix level tests to test the new EntitlementAPI …

10/30/2015 4:58:58 PM

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

Matias Aguero

Commit: a7d2a2e

Tree: 2fd64d6

Parents: 17ec0f6

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

10/30/2015 4:58:04 PM

Matias Aguero

Commit: 17ec0f6

Tree: 50ebc7b

Parents: fa51ca9

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

10/27/2015 3:58:47 PM

Matias Aguero

Commit: fa51ca9

Tree: ca7dad6

Parents: 324ad47

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

11/10/2015 10:22:06 PM

stephane brossier

Commit: 3cbb35e

Tree: 22302bd

Parents: 7e93e6c
2a9120d

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

11/10/2015 10:21:50 PM

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

Stéphane Brossier

Commit: 2a9120d

Tree: c8de55e

Parents: 97bfd3d
9c55f25

#315: also allow to use bundleId apart of externalKey for ADD_ON …

11/9/2015 6:42:18 PM

subscriptions.

Matias Aguero

Commit: 9c55f25

Tree: 0881bbd

Parents: 2717f03

#315 : allow users to ONLY specify the bundleExternalKey instead …

11/4/2015 4:34:49 PM

of bundleId when create an ADD_ON subscription

Matias Aguero

Commit: 2717f03

Tree: f17f5eb

Parents: d82926a

Merge remote-tracking branch 'origin/mariadb-java-client-upgrade'

11/10/2015 10:18:58 PM

stephane brossier

Commit: 7e93e6c

Tree: af85044

Parents: 0123d5c
d8f7165