killbill-memoizeit

<< < 91 92 93 94 95 > >>

Merge branch 'entitlement++' Conflicts: entitlement/killbill-entitlement.iml entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiAddOn.java

7/18/2013 1:11:13 PM

stephane brossier

Commit: 2e0a506

Parents: ee1f435
b16351e

Increment oss parent to have latest killbill-api for subscription …

7/18/2013 1:00:13 PM

-> entitlement work

stephane brossier

Commit: b16351e

Parents: e14beaa

Fix flaky tests

7/17/2013 11:21:28 PM

stephane brossier

Commit: e14beaa

Parents: b533aac

Merge remote-tracking branch 'origin/master' into entitlement++ Conflicts: entitlement/killbill-entitlement.iml

7/17/2013 10:06:11 PM

stephane brossier

Commit: b533aac

Parents: 60aec71
34fb811

Copyright in IntelliJ

7/17/2013 9:51:09 PM

stephane brossier

Commit: 60aec71

Parents: 3a0b351

Merge remote-tracking branch 'origin/master' into entitlement++

7/17/2013 9:49:38 PM

stephane brossier

Commit: 3a0b351

Parents: 260c3f8
0a0bf8a

Add missing (deleted by git) copyright

7/17/2013 9:45:49 PM

stephane brossier

Commit: 260c3f8

Parents: 4fbf070

Merge remote-tracking branch 'origin/master' into entitlement++ Conflicts: beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java

7/17/2013 9:41:23 PM

stephane brossier

Commit: 4fbf070

Parents: c755a5d
3b695c9

Fix plugin test after API change (OSGI import/export)

7/17/2013 9:18:11 PM

stephane brossier

Commit: c755a5d

Parents: f2bce84

JunctionApi -> EntitlementApi

7/17/2013 1:05:27 PM

stephane brossier

Commit: f2bce84

Parents: 39da752