5/14/2012 9:24:27 PM
into integration
|
|
|
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
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
