killbill-aplcache

beatrix: add missing TagStoreModule module Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Merge remote-tracking branch 'origin/audit-rework-nocleanup' …

into audit-rework

Conflicts:
	account/src/main/resources/com/ning/billing/account/ddl.sql
	account/src/test/java/com/ning/billing/account/api/user/DefaultAccountUserApiTestWithDB.java
	server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
	tenant/src/main/resources/com/ning/billing/tenant/ddl.sql

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

Merge branch 'audit-rework-nocleanup' of github.com:killbill/killbill …

into audit-rework-nocleanup

util: implement getTags in MockTagDao Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

account: fix migrateAccount call We were returning the wrong …

id for the newly created account.

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

Fix server tests

Merge branch 'audit-rework-nocleanup' of github.com:killbill/killbill …

into audit-rework-nocleanup

server: import the DBIProvider from the skeleton This allows …

us to register our custom mappers and binders.

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

util: tenant: add missing parameter for accountRecordIdFieldWithComma This …

fixes Stringtemplate warnings.

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

account: cleanup tests Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>