killbill-aplcache

remove deletes fromt eh system (excepting tags and custom fields); …

4/5/2012 5:22:38 PM

also removed undoMigration as a consequence; fixed type in PlanPhaseSpecifier

Jeff Certain

Commit: 188ea4e

Tree: 30293c3

Parents: f7bf18e

. Fix server issues . Implement Account jaxrs resource (except …

4/6/2012 11:06:58 PM

bundles and delete call not yet supported)
. Unit test regresion framework for jaxrs
. Unit etsts for Account

stephane brossier

Commit: db324be

Tree: f66b4ca

Parents: b315a99

Disable tests until fixed

4/6/2012 12:20:18 AM

stephane brossier

Commit: b315a99

Tree: f4f5758

Parents: 9ba0a4d

Merge branch 'integration' into server Conflicts: entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanMemory.java entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreateMemory.java

4/5/2012 11:30:39 PM

stephane brossier

Commit: 9ba0a4d

Tree: df82f65

Parents: 7f9e4be
af1b8b6

Continuation on guice fixing circular dep in entitlement (test …

4/5/2012 11:23:38 PM

part)

stephane brossier

Commit: af1b8b6

Tree: e3362af

Parents: dc89806

Merge branch 'integration' into server Conflicts: invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java

4/5/2012 10:18:35 PM

stephane brossier

Commit: 7f9e4be

Tree: 7cda818

Parents: c81cbbd
dc89806

Fix wrong use of entitlement DAO from invoice module

4/5/2012 10:16:13 PM

stephane brossier

Commit: dc89806

Tree: 5f569ed

Parents: b741196

Fix guice circular dependency between SubscriptionFactory …

4/5/2012 9:47:15 PM

<-> SubscriptionApiService <-> EntitlementDao

stephane brossier

Commit: b741196

Tree: 696c213

Parents: c6d8f93

Check-in server/jaxrs changes to switch back to integration …

4/5/2012 6:10:07 PM

branch

stephane brossier

Commit: c81cbbd

Tree: ae26de7

Parents: d8e5274

Merge branch 'master' into server

4/3/2012 6:32:28 PM

stephane brossier

Commit: d8e5274

Tree: a0c2eaa

Parents: 5d644dc
7ec4bc1