killbill-developers

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

Merge pull request #389 from david-xie/add_pg_support Add …

PostgreSQL support to db-helper

Add PostgreSQL support to db-helper

Fixes #361 Conflicts: invoice/src/main/java/org/killbill/billing/invoice/generator/DefaultInvoiceGenerator.java invoice/src/test/java/org/killbill/billing/invoice/dao/TestInvoiceDao.java invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java

Fixes #362

invoice: Refactor DefaultInvoiceGenerator and remove BillingModeGenerator Pure …

refactoring, no side effect.

Merge remote-tracking branch 'origin/master' into invoice_and_usage

Update pom with latest oss released version

Merge remote-tracking branch 'origin/master' into invoice_and_usage

invoice, payment: Export a new system property org.killbill.(payment|invoice).globalLock.retries …

to configure max # retries for global lock

(Tedious change that reqiures a lot of refactoring for all the non guice injected classes)