killbill-uncached

Merge branch 'irs-integration' of github.com:ning/killbill …

11/16/2011 7:15:50 PM

into irs-integration

Martin Westhead

Commit: de55b10

Tree: 00261fc

Parents: 9f4c79d
ccb70d6

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

11/16/2011 6:21:12 PM

stephane brossier

Commit: ccb70d6

Tree: c131193

Parents: 2b68911

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

11/16/2011 6:21:04 PM

killbill-0.0.13

stephane brossier

Commit: 2b68911

Tree: ae66daf

Parents: 1524cee

Fix maven classpath issue and broken lifecycle test

11/16/2011 5:31:46 PM

stephane brossier

Commit: 1524cee

Tree: eb1aa07

Parents: bcb9909

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

11/15/2011 11:57:00 PM

stephane brossier

Commit: bcb9909

Tree: c62bed5

Parents: 9bb95e6

[maven-release-plugin] prepare release killbill-0.0.13-lifecycle

11/15/2011 11:56:53 PM

killbill-0.0.13-lifecycle

stephane brossier

Commit: 9bb95e6

Tree: 658d2db

Parents: 569038f

Integration for new EventBus/Lifecycle fix with IRS

11/15/2011 11:41:18 PM

stephane brossier

Commit: 569038f

Tree: e5705ea

Parents: dad064a

Merge remote branch 'origin/irs-integration' into irs-lifecycle

11/15/2011 6:42:12 PM

stephane brossier

Commit: dad064a

Tree: a397116

Parents: c36c940
c55628a

Introducing new EventBus (memory/guava implementation only) …

11/15/2011 6:17:01 PM

in the system

stephane brossier

Commit: c36c940

Tree: 76cc428

Parents: 63ef968

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