killbill-aplcache

Unit tests for repair APIs... and more to come

Ongoinf repair test/bug fix

Ingoing entitlement repair work

Ongoing repair unit tests

Remove (unused) wrong import

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

is incomplete

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

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

Payment api change to include context

Merge branch 'integration' into payment-plus-account

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

into integration