killbill-memoizeit

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

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