killbill-aplcache

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

3/8/2012 2:10:35 PM

into integration

Jeff Certain

Commit: 1756659

Tree: f490c6a

Parents: d15996f
c2788fa

Removed nextRetryDate from paymentAttempt as NotificationQueue …

3/8/2012 2:11:02 AM

takes care of it now

alena

Commit: c2788fa

Tree: 420c1b8

Parents: 71e7290

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

3/7/2012 7:27:45 PM

into integration

Conflicts:
	invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java

Jeff Certain

Commit: d15996f

Tree: abaa20d

Parents: 9338b27
71e7290

Fix beatrix test failure becayse of chnage in Payment

3/6/2012 11:21:17 PM

stephane brossier

Commit: 71e7290

Tree: 047a161

Parents: 7e1ef63

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

3/6/2012 10:58:29 PM

into integration

stephane brossier

Commit: 7e1ef63

Tree: ee65c44

Parents: b710319
aebc230

Added another constructor in payment error

3/6/2012 3:45:25 AM

alena

Commit: aebc230

Tree: b715f85

Parents: 154b305

Add Cutsom fields to Subscription object

3/6/2012 10:57:29 PM

stephane brossier

Commit: b710319

Tree: abadcdc

Parents: 154b305

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

3/5/2012 11:01:40 PM

into integration

stephane brossier

Commit: 154b305

Tree: e210628

Parents: c0df13b
3876179

Remove Pause/resume APis and add implement recreate API

3/5/2012 11:00:15 PM

stephane brossier

Commit: c0df13b

Tree: 1a0bf49

Parents: 1640a72

update to enable proper handling of future invoice items (i.e. …

3/7/2012 4:50:34 PM

don't always reverse them)

Jeff Certain

Commit: 9338b27

Tree: 8c99da7

Parents: bf1ff89