killbill-aplcache

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

style: reformat all modules No functional change. Signed-off-by: …

6/14/2012 9:44:18 PM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 2629199

Tree: e7ddff4

Parents: 7d7f9d2

Fixed issue with addon catalog endppoint

6/15/2012 3:35:55 AM

Martin Westhead

Commit: 134a28d

Tree: b144032

Parents: c5a24ed

Use skeleton SNAPSHOT for test

6/15/2012 8:41:25 PM

stephane brossier

Commit: 497dd43

Tree: 2637f42

Parents: b80d9d7

Remove log4j dependencies Work on server module to start with …

6/15/2012 8:19:29 PM

tomcat
Create war with dependencies

stephane brossier

Commit: b80d9d7

Tree: f71bb82

Parents: c5a24ed

[maven-release-plugin] prepare for next development iteration

6/14/2012 10:04:40 PM

stephane brossier

Commit: c5a24ed

Tree: a2a4c81

Parents: 10c7f2a

[maven-release-plugin] prepare release killbill-0.1.13

6/14/2012 10:04:28 PM

killbill-0.1.13

stephane brossier

Commit: 10c7f2a

Tree: acfeb5b

Parents: 7d7f9d2

util: disable EmailSenderTest Don't send emails to the external …

6/14/2012 9:12:43 PM

world.

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

Pierre-Alexandre Meyer

Commit: 7d7f9d2

Tree: 38a2662

Parents: 48bec99

server: reformat TestJaxrsBase No functional change. Signed-off-by: …

6/14/2012 8:48:48 PM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 48bec99

Tree: 9c3f73a

Parents: adc841a

server: reformat TestInvoice No functional change. Signed-off-by: …

6/14/2012 8:46:34 PM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: adc841a

Tree: da5b224

Parents: 22e261f