killbill-memoizeit

<< < 29 30 31 32 33 > >>

Merge branch 'usage'

4/5/2014 4:37:48 PM

stephane brossier

Commit: 54cb7a2

Tree: fc81f51

Parents: d26f995
54053ea

Add basic endpoints for usage

3/31/2014 12:40:30 AM

stephane brossier

Commit: 54053ea

Tree: e1668c5

Parents: 65dba4b

Fix missing copyrights

3/30/2014 7:57:00 PM

stephane brossier

Commit: 65dba4b

Tree: aa0c667

Parents: d377280

Implement UsageApi (and associated UsageDao) Remove UsageMock …

3/30/2014 6:34:40 PM

for Beatrix test

stephane brossier

Commit: d377280

Tree: 35973f9

Parents: 9dc0d27

Merge remote-tracking branch 'origin/master' into usage Conflicts: pom.xml

3/30/2014 2:26:57 PM

stephane brossier

Commit: 9dc0d27

Tree: bdc707e

Parents: 9501989
33d394a

Usage in arrear: - Enhance beatrix test TestConsumableInArrear - …

3/30/2014 2:25:30 PM

Code review integration
- Fix additional isaues found while testing

stephane brossier

Commit: 9501989

Tree: c2fd969

Parents: d358f96

server: update default properties 33d394a765e653337596a0af383888d229c0f5cc …

4/3/2014 12:54:00 PM

broke them.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: d26f995

Tree: eb2cd3b

Parents: cc8a2ac

osgi-bundles: fix killbill osgi lib build Signed-off-by: …

4/2/2014 11:23:58 AM

Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: cc8a2ac

Tree: 4f8aa87

Parents: 33d394a

osgi: use same jdbc defaults as the main connection pool Signed-off-by: …

3/28/2014 10:33:10 PM

Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: 33d394a

Tree: f0e134a

Parents: 6c75715

osgi: fix dependencies We were importing both OSGI interfaces …

3/28/2014 10:31:00 PM

relocated by Felix and the ones
provided by the org.osgi groupId.

This was causing conflicts at runtime on certain deployments. We now only
use the Felix ones.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: 6c75715

Tree: 837337d

Parents: b3674fb