killbill-aplcache

<< < 341 342 343 344 345 > >>

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

4/18/2012 9:40:45 PM

is incomplete

stephane brossier

Commit: eeb76d8

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

stephane brossier

Commit: e25112b

Parents: ee32296
2f8a863

Payment api change to include context

4/12/2012 5:31:29 PM

alena

Commit: 2f8a863

Parents: 8c9dfeb

Merge branch 'integration' into payment-plus-account

4/12/2012 1:48:34 PM

alena

Commit: 8c9dfeb

Parents: ec8beb6
067c9d4

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

4/12/2012 1:48:07 PM

into integration

alena

Commit: 067c9d4

Parents: df38ad2
00c715b

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

4/9/2012 8:56:54 PM

Jeff Certain

Commit: 00c715b

Parents: 85f9bd5

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

4/9/2012 8:56:49 PM

killbill-0.1.10

Jeff Certain

Commit: 85f9bd5

Parents: ebb2cad

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

4/9/2012 8:16:03 PM

Jeff Certain

Commit: ebb2cad

Parents: b59d159

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

4/9/2012 8:15:57 PM

killbill-0.1.9

Jeff Certain

Commit: b59d159

Parents: 40d1706

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

4/9/2012 8:00:27 PM

Jeff Certain

Commit: 40d1706

Parents: a0f5fe0
7ec4bc1