3/21/2012 7:49:32 PM
into integration
Conflicts:
analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java
|
|
|
3/21/2012 5:35:26 PM
date listener and poster)
|
|
|
3/20/2012 5:13:05 PM
into integration
Conflicts:
account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java
entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/SubscriptionSqlDao.java
invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.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/main/resources/com/ning/billing/invoice/ddl.sql
invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java
util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java
util/src/test/java/com/ning/billing/util/globallocker/TestMysqlGlobalLocker.java
util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
|
|
|
|
|
|
|
|
|
3/27/2012 10:25:11 PM
continuation of cleanup started by Pierre
(To be reviewed by team)
Conflicts:
entitlement/pom.xml
invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
pom.xml
util/pom.xml
util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
util/src/test/java/com/ning/billing/util/validation/TestValidationManager.java
|
