killbill-developers

<< < 526 527 528 529 530 > >>

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

4/17/2012 6:53:42 PM

into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java

Jeff Certain

Commit: 60a048b

Parents: 3d08f6c
ff421c2

added toJodaPeriod to Duration and DefaultDuration

4/17/2012 6:04:24 PM

Jeff Certain

Commit: 3d08f6c

Parents: 01a0674

update history_id -> history_record_id

4/17/2012 6:02:35 PM

Jeff Certain

Commit: 01a0674

Parents: bdb0dea

account email stack

4/17/2012 5:08:09 PM

Jeff Certain

Commit: bdb0dea

Parents: e25112b

Started refactor of InvoiceModule

5/2/2012 9:50:21 PM

Martin Westhead

Commit: 081aab0

Parents: 6633087

Started refactor of InvoiceModule

5/2/2012 9:50:06 PM

Martin Westhead

Commit: 6633087

Parents: b12fffb

Refactoring of Guice modules for greater test modularity

5/2/2012 9:38:58 PM

Martin Westhead

Commit: b12fffb

Parents: c542d9c

Fix null Plan or null Phase issue

5/2/2012 5:47:06 PM

stephane brossier

Commit: c542d9c

Parents: ef5527e

Fixing test issues

5/2/2012 4:38:29 PM

stephane brossier

Commit: ef5527e

Parents: 7420197

Merge branch 'integration' into server

5/2/2012 1:59:08 PM

stephane brossier

Commit: 7420197

Parents: 2d02dd2
6f50c2a