killbill-aplcache

obfuscators: hack to avoid obfuscating the profiling header Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

server: fix ActiveMerchant XML obfuscation Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

util: optimize session update query This is an attempt to …

fix https://github.com/killbill/killbill/issues/326.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

account: replace UUID.randomUUID() invocation in AccountModelDao Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

introduce a UUIDs helper and use it instead of UUID.randomUUID …

through the code

... this is currently a naive experiment of avoiding shared SecureRandom contention

Fix mistake in TestNG annotation Add new test for Payment Control …

Plugin API

Fix xml indentation

Add test to verify upgrade scenario from an annual plan to another …

annual plan

Merge branch 'master' of github.com:killbill/killbill

Fixes #311 Conflicts: api/src/main/java/org/killbill/billing/subscription/api/SubscriptionBaseInternalApi.java invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceDispatcher.java invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java