killbill-memoizeit

<< < 26 27 28 29 30 > >>

Merge branch 'master' into payment-work Conflicts: analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java

12/7/2011 1:22:12 AM

alena

Commit: 5348179

Parents: dbfa8e7
1e1ab50

Stub for new api method

12/7/2011 1:17:03 AM

alena

Commit: dbfa8e7

Parents: 4c1a3c2

Merge branch 'master' into payment-work

12/6/2011 6:41:12 PM

alena

Commit: 4c1a3c2

Parents: ed5ac7c
c6fc9f8

Merge branch 'payment-work' of github.com:alenad/killbill …

12/6/2011 2:31:54 AM

into payment-work

alena

Commit: ed5ac7c

Parents: 6bdc4fb
ff20911

Added licenses

12/6/2011 1:55:33 AM

alena

Commit: ff20911

Parents: 521abaf

Made maven generate test-jars

12/6/2011 1:55:19 AM

alena

Commit: 521abaf

Parents: a6a3237

Merge branch 'payment-work' of github.com:alenad/killbill …

12/6/2011 1:38:57 AM

into payment-work

Conflicts:
	api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
	api/src/main/java/com/ning/billing/payment/api/PaymentMethodInfo.java
	payment/src/main/java/com/ning/billing/payment/CreditCardPaymentMethod.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java

alena

Commit: a6a3237

Parents: c315294
23cc91c

Merge branch 'payment-work' of github.com:alenad/killbill …

12/5/2011 7:24:15 PM

into payment-work

alena

Commit: 23cc91c

Parents: 318b0eb
e130284

Merge branch 'payment-work' of github.com:alenad/killbill …

12/5/2011 6:45:00 PM

into payment-work

alena

Commit: e130284

Parents: 2b9f6c7
c824d67

Draft implementation of payment api

12/5/2011 4:13:21 AM

alena

Commit: c824d67

Parents: 78975db