Prosoft Git

killbill-memoizeit

<< < 169 170 171 172 173 > >>

Modified mock after merge

2/24/2012 4:38:24 PM
alena

alena

Commit: d10b219

Tree: 741a4a0

Parents: c535211

Merge branch 'payment-plus-account' into integration

2/24/2012 4:22:54 AM
alena

alena

Commit: c535211

Tree: 4ef375e

Parents: fc4ba15
07676ed

Minor payment api test changes

2/23/2012 4:27:52 AM
alena

alena

Commit: 07676ed

Tree: 6805166

Parents: b3a1605

Work on payment attempts

2/21/2012 5:07:15 AM
alena

alena

Commit: b3a1605

Tree: 36d4108

Parents: 358d0fd

Merge branch 'integration' into payment-plus-account

2/17/2012 11:26:38 PM
alena

alena

Commit: 358d0fd

Tree: 437c3fa

Parents: ec650d0
c4a8fe4

Merge branch 'master' into payment-plus-account

2/17/2012 1:57:11 AM
alena

alena

Commit: ec650d0

Tree: 89e1edb

Parents: e92a10b
8bbd3e7

Merge remote branch 'upstream/master'

2/17/2012 1:46:31 AM
alena

alena

Commit: 8bbd3e7

Tree: 813bdca

Parents: c9a8560
d3ae9fe

Merge branch 'master' into payment-plus-account Conflicts: payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java payment/src/main/java/com/ning/billing/payment/setup/PaymentConfig.java

2/16/2012 2:38:01 AM
alena

alena

Commit: e92a10b

Tree: 8f158b1

Parents: 0d14d5f
c9a8560

Work on payment retries

2/15/2012 12:34:07 AM
alena

alena

Commit: 0d14d5f

Tree: 20eda1c

Parents: 1106f09

Merge from master

2/14/2012 3:25:26 AM
alena

alena

Commit: 1106f09

Tree: bb9fa8c

Parents: 7b4ba4d
9ea091e

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github