|
5/22/2012 11:43:19 PM
id to paymentInfo; change entitlement_events table to subscription_events
|
5/17/2012 8:10:34 PM
not all poms had the same version), CallContext update to include reason code and comments
|
|
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
|
5/15/2012 1:22:06 PM
into integration
|
|
|
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
|
5/14/2012 9:24:27 PM
into integration
|