killbill-aplcache

<< < 35 36 37 38 39 > >>

move BillingEvent and BllingEventSet to Invoice

1/6/2012 4:57:27 PM

jeff

Commit: 0f95ee0

Tree: 253f95a

Parents: 8f13518

Merge branch 'master' of github.com:ning/killbill into inv-ent-integration …

1/25/2012 2:18:21 AM

(picking up payment/invoice integration work)

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
	invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	pom.xml

Jeff Certain

Commit: 65367f9

Tree: d270f38

Parents: 011d450

Merge branch 'master' of github.com:ning/killbill into inv-ent-integration …

1/24/2012 9:00:00 PM

(picking up payment/invoice integration work)

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
	invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	pom.xml