killbill-memoizeit

<< < 22 23 24 25 26 > >>

Merged with latest changes

5/3/2012 8:47:44 PM

Martin Westhead

Commit: 578b521

Tree: 85cac47

Parents: 081aab0
b0990bb

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

5/2/2012 7:43:23 PM

into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java

Jeff Certain

Commit: b0990bb

Tree: a51d551

Parents: efcee76

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

5/2/2012 6:44:02 PM

into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java

Jeff Certain

Commit: efcee76

Tree: f2951c7

Parents: 91e1fea

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

5/2/2012 6:27:33 PM

into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java

Jeff Certain

Commit: 91e1fea

Tree: 2de1b49

Parents: 0b7b047
c542d9c

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

5/2/2012 6:25:02 PM

into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
	api/src/main/java/com/ning/billing/account/api/AccountData.java
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiAddOn.java
	invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingAccountUserApi.java
	server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java

Jeff Certain

Commit: 0b7b047

Tree: c0e607f

Parents: 35a6fcc
6f50c2a

updates for tag api

5/2/2012 12:32:30 PM

Jeff Certain

Commit: 35a6fcc

Tree: 2a4b728

Parents: 12d8b89

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

4/30/2012 12:31:47 PM

into integration

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
	server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java