killbill-uncached

<< < 251 252 253 254 255 > >>

Remove (unused) wrong import

4/18/2012 10:27:24 PM

stephane brossier

Commit: be02a18

Tree: f9b5a56

Parents: eeb76d8

First pass on entitlement repair API-- build stable, but feature …

4/18/2012 9:40:45 PM

is incomplete

stephane brossier

Commit: eeb76d8

Tree: 4743349

Parents: e25112b

Merge branch 'integration' into server NOT SO TRIVIAL MERGE.... …

4/14/2012 12:17:39 AM

PFFFF...

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EventSqlDao.java
	entitlement/src/main/resources/com/ning/billing/entitlement/engine/dao/EventSqlDao.sql.stg
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java
	payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java