killbill-aplcache

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

11/12/2011 2:49:37 PM

into irs-integration

Conflicts:
	entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiError.java

stephane brossier

Commit: 6b6ba4e

Tree: d99eb68

Parents: 7d4528d
26587ef

Updating XML files to match new schema

11/12/2011 2:48:38 AM

Martin Westhead

Commit: 26587ef

Tree: 014cd4a

Parents: f1d5ad3

Fixed pricelists to do overriding, refactored rules a little …

11/12/2011 1:21:33 AM

and added sticky pricelist rule

Martin Westhead

Commit: f1d5ad3

Tree: 23d592c

Parents: 40257fc

Merge branch 'master' into martin

11/11/2011 6:08:25 PM

Martin Westhead

Commit: 40257fc

Tree: 7708d0f

Parents: 1c86fb0
7a0e8b7

Adding pretty print to XML output

11/11/2011 6:07:50 PM

Martin Westhead

Commit: 1c86fb0

Tree: 0c29a49

Parents: ead22fa

Import fixes

11/11/2011 4:53:14 PM

Martin Westhead

Commit: ead22fa

Tree: 5684d0d

Parents: 79bc882

Add change required fo tests

11/12/2011 2:47:22 PM

stephane brossier

Commit: 7d4528d

Tree: e55ded4

Parents: 7a0e8b7

Move account dependency in test scope

11/10/2011 10:42:27 PM

stephane brossier

Commit: 7a0e8b7

Tree: befa30f

Parents: 79bc882

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

11/10/2011 8:26:47 PM

stephane brossier

Commit: 79bc882

Tree: 9b67fb9

Parents: 6f01486

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

11/10/2011 8:26:42 PM

killbill-0.0.9

stephane brossier

Commit: 6f01486

Tree: f22256b

Parents: 1a33498