killbill-aplcache

util: fix casing of translation files Signed-off-by: Pierre-Alexandre …

6/16/2012 6:39:10 PM

Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 5923acf

Tree: c432f5a

Parents: ac47dd8

Merge with upstream

6/16/2012 3:22:10 AM

stephane brossier

Commit: ac47dd8

Tree: 9df729c

Parents: 41d9b56

Merge branch 'server' of github.com:ning/killbill into server

6/15/2012 9:26:17 PM

Pierre-Alexandre Meyer

Commit: 41d9b56

Tree: 5578834

Parents: 33bc2b1
bf66007

Add initialization for mysql driver in server module

6/15/2012 9:05:39 PM

stephane brossier

Commit: bf66007

Tree: 7236194

Parents: 314dcbb

pom.xml: ignore examples directory for rat Signed-off-by: …

6/15/2012 8:59:19 PM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 33bc2b1

Tree: d29f16e

Parents: bfc7669

Merge branch 'server' of github.com:ning/killbill into server Conflicts: server/pom.xml Signed-off-by: …

6/15/2012 8:57:28 PM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: bfc7669

Tree: fe5ce94

Parents: 4e748bd
314dcbb

pom cleanup

6/15/2012 8:55:18 PM

stephane brossier

Commit: 314dcbb

Tree: 9559563

Parents: 497dd43

Merge branch 'integration' into server Conflicts: beatrix/pom.xml junction/pom.xml server/pom.xml util/src/test/java/com/ning/billing/dbi/DBIProvider.java Signed-off-by: …

6/15/2012 8:55:13 PM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 4e748bd

Tree: ec5e0a0

Parents: 497dd43
8d23910

Merge with integration

6/15/2012 4:13:16 AM

Martin Westhead

Commit: 8d23910

Tree: dc2565f

Parents: 134a28d
9cefb0d

Merge branch 'integration' of github.com:ning/killbill …

6/14/2012 10:08:08 PM

into integration

Conflicts:
	server/pom.xml

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 9cefb0d

Tree: e7ebb90

Parents: 2629199
c5a24ed