killbill-aplcache

util: add missing tenant_record_id column in default accounts …

table

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

Merge remote-tracking branch 'origin/svcapi-progress' …

into svcsapi

Re-enable test that has been fixed in other branch

Fix broken test after API refactoring

Fixing tests after internal API change

More test fix for Intermal API move

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: invoice/src/test/java/com/ning/billing/invoice/MockModule.java invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java

Fixing issues with tenants

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: invoice/src/main/java/com/ning/billing/invoice/notification/EmailInvoiceNotifier.java junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingEntitlementUserApi.java util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java

Partial checkin to merge from svcapi