killbill-aplcache

Merge remote-tracking branch 'origin/hierarchical-accounts' …

7/14/2016 10:44:14 AM

into 458-ha-overdue

Matias Aguero

Commit: 1fb3b15

Tree: 1e3a66a

Parents: ef2142e
ec54044

Merge remote-tracking branch 'origin/hierarchical-accounts' …

7/13/2016 2:32:44 PM

into 458-ha-overdue

Matias Aguero

Commit: ef2142e

Tree: c654ace

Parents: dc00055
b2cd2df

#458 - fixes

7/12/2016 10:05:01 AM

Matias Aguero

Commit: dc00055

Tree: 86eaa1e

Parents: 50d589d

Merge remote-tracking branch 'origin/hierarchical-accounts' …

7/11/2016 4:23:12 PM

into 458-ha-overdue

# Conflicts:
#	overdue/src/main/java/org/killbill/billing/overdue/wrapper/OverdueWrapper.java

Matias Aguero

Commit: 50d589d

Tree: fcc014c

Parents: 400e828
33934f5

Merge remote-tracking branch 'origin/hierarchical-accounts' …

7/7/2016 12:34:15 PM

into 458-ha-overdue

Matias Aguero

Commit: 400e828

Tree: 9f2a0b1

Parents: 6e85554
8141e9c

Merge remote-tracking branch 'origin/hierarchical-accounts' …

7/5/2016 3:57:22 PM

into 458-ha-overdue

Matias Aguero

Commit: 6e85554

Tree: a29f00e

Parents: 3b2a09d
b20a55d

#458 - Ovedue refresh actions propagated to children accounts.

7/4/2016 11:49:08 AM

Matias Aguero

Commit: 3b2a09d

Tree: 02a8dd6

Parents: 6b4fd77

Merge branch 'work-for-release-0.17.x' of github.com:killbill/killbill …

7/15/2016 10:03:07 PM

into work-for-release-0.17.x

stephane brossier

Commit: d729258

Tree: 2e56f1f

Parents: 60cad8a
322e846

jaxrs: upgrade Swagger to 1.5.9 APIs are now at /swagger.json. Signed-off-by: …

7/15/2016 6:28:31 PM

Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: 322e846

Tree: b77ad87

Parents: 6dde529

killpay: add missing Guice module Signed-off-by: Pierre-Alexandre …

7/14/2016 11:49:03 PM

Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: 6dde529

Tree: 71f483f

Parents: 67aa703