killbill-uncached

<< < 9 10 11 12 13 > >>

Merge branch 'master' into irs-lifecycle Conflicts: analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java api/src/main/java/com/ning/billing/entitlement/api/IEntitlementService.java entitlement/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java util/src/test/resources/log4j.xml

11/14/2011 11:09:39 PM

stephane brossier

Commit: 63ef968

Tree: cc0f353

Parents: 2abc7b9
e1f9250

Add initial unit test for EventBus

11/14/2011 9:23:31 PM

stephane brossier

Commit: 2abc7b9

Tree: 0db1d09

Parents: c1a38d3

Introduing EventBus into killbill

11/11/2011 6:56:44 PM

stephane brossier

Commit: c1a38d3

Tree: 7032478

Parents: aabb5eb

Introduing EventBus into killbill

11/11/2011 6:55:47 PM

stephane brossier

Commit: aabb5eb

Tree: 8edfd65

Parents: 7a0e8b7

skelton in place for new plan change API

11/15/2011 7:26:02 PM

Martin Westhead

Commit: 9f4c79d

Tree: bf0e327

Parents: c55628a

Making catalog tests pass plus merging with irs-integration

11/15/2011 4:56:48 PM

Martin Westhead

Commit: c55628a

Tree: 2f6652f

Parents: 738a50a
e1f9250

[maven-release-plugin] prepare for next development iteration

11/14/2011 10:22:48 PM

stephane brossier

Commit: e1f9250

Tree: 71d83a4

Parents: c4d0c48

[maven-release-plugin] prepare release killbill-0.0.12

11/14/2011 10:22:34 PM

killbill-0.0.12

stephane brossier

Commit: c4d0c48

Tree: 7a97525

Parents: 33ed09e

Merge branch 'master' into irs-integration Conflicts: entitlement/src/main/resources/com/ning/billing/entitlement/ddl.sql

11/14/2011 9:53:51 PM

stephane brossier

Commit: 33ed09e

Tree: 4c9e7c6

Parents: a1d4f91
26c3c42

account: entitlement: remove hardcoded database name in ddl.sql This …

11/14/2011 8:37:41 PM

breaks internal tests.

Misc.: remove trailing spaces.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 26c3c42

Tree: fd973f3

Parents: 769d5b7