4/5/2012 9:47:15 PM
<-> SubscriptionApiService <-> EntitlementDao
|
|
|
|
|
|
|
4/5/2012 8:54:33 PM
add history to tags; fix InvoiceDaoTestBase to remove reference to account/ddl.sql
|
4/5/2012 5:22:38 PM
also removed undoMigration as a consequence; fixed type in PlanPhaseSpecifier
|
|
|
|
|
3/30/2012 7:10:16 PM
into integration
Conflicts:
account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
api/src/main/java/com/ning/billing/account/api/Account.java
api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
api/src/main/java/com/ning/billing/util/api/TagUserApi.java
entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java
entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultEntitlementBillingApi.java
invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java
invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
|
3/29/2012 3:07:04 AM
into integration
|
