killbill-aplcache

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

5/15/2012 8:39:46 PM

into integration

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/DefaultNotification.java
	util/src/main/java/com/ning/billing/util/notificationq/Notification.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java

Jeff Certain

Commit: 6bc860a

Tree: 72a854f

Parents: 6b6da75

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

5/15/2012 1:22:06 PM

into integration

Jeff Certain

Commit: 6b6da75

Tree: f77c25b

Parents: 912713a
6cbb6bf

Missing an include

5/14/2012 10:59:00 PM

Martin Westhead

Commit: 6cbb6bf

Tree: 1da78be

Parents: 696dc22

Better fix for NPE

5/14/2012 10:54:59 PM

Martin Westhead

Commit: 696dc22

Tree: 73e88c4

Parents: 61924d9

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

5/15/2012 1:21:43 PM

into integration

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/DefaultNotification.java
	util/src/main/java/com/ning/billing/util/notificationq/Notification.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java

Jeff Certain

Commit: 912713a

Tree: 0539f97

Parents: eda667f

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

5/14/2012 9:24:27 PM

into integration

Jeff Certain

Commit: eda667f

Tree: c26c992

Parents: 078589b
61924d9

Fix for NPEs if there is no overdue config

5/14/2012 8:57:22 PM

Martin Westhead

Commit: 61924d9

Tree: c6de3fd

Parents: bbbc5eb

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

5/14/2012 9:23:40 PM

into integration

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/DefaultNotification.java
	util/src/main/java/com/ning/billing/util/notificationq/Notification.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java

Jeff Certain

Commit: 078589b

Tree: c4ea5ac

Parents: 674a3fb
bbbc5eb

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

5/14/2012 8:30:42 PM

into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
	api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
	invoice/pom.xml
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/test/java/com/ning/billing/payment/TestHelper.java
	payment/src/test/java/com/ning/billing/payment/TestRetryService.java
	payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/main/resources/com/ning/billing/util/bus/dao/PersistentBusSqlDao.sql.stg
	util/src/main/resources/com/ning/billing/util/ddl.sql
	util/src/main/resources/com/ning/billing/util/notificationq/dao/NotificationSqlDao.sql.stg
	util/src/test/java/com/ning/billing/util/notificationq/dao/TestNotificationSqlDao.java

Jeff Certain

Commit: 674a3fb

Tree: e10e185

Parents: 384ab2e
6092256

DDL changes; updates for tag API

5/10/2012 5:10:58 PM

Jeff Certain

Commit: 384ab2e

Tree: bbe39a0

Parents: b0990bb