killbill-aplcache

<< < 296 297 298 299 300 > >>

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

Parents: 7f9e4be
af1b8b6

Continuation on guice fixing circular dep in entitlement (test …

4/5/2012 11:23:38 PM

part)

stephane brossier

Commit: af1b8b6

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

Parents: c81cbbd
dc89806

Fix wrong use of entitlement DAO from invoice module

4/5/2012 10:16:13 PM

stephane brossier

Commit: dc89806

Parents: b741196

Fix guice circular dependency between SubscriptionFactory …

4/5/2012 9:47:15 PM

<-> SubscriptionApiService <-> EntitlementDao

stephane brossier

Commit: b741196

Parents: c6d8f93

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

4/5/2012 6:10:07 PM

branch

stephane brossier

Commit: c81cbbd

Parents: d8e5274

Merge branch 'master' into server

4/3/2012 6:32:28 PM

stephane brossier

Commit: d8e5274

Parents: 5d644dc
7ec4bc1

README.md

4/3/2012 6:30:11 PM

stephane brossier

Commit: 7ec4bc1

Parents: 32cd7b6

Add copyright for doc files

4/3/2012 6:24:42 PM

stephane brossier

Commit: 5d644dc

Parents: dbd4d0d

Initial revision for doc

4/3/2012 6:04:26 PM

stephane brossier

Commit: dbd4d0d

Parents: 4610dfa