killbill-aplcache

beatrix: update tests plugins Bump killbill-notification-test …

to 1.7.3 and
killbill-payment-test to 1.6.3.

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

Merge remote-tracking branch 'origin/master' into bitcoin Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxRsResourceBase.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	util/src/main/java/com/ning/billing/util/customfield/api/DefaultCustomFieldUserApi.java
	util/src/main/java/com/ning/billing/util/customfield/dao/CustomFieldDao.java
	util/src/main/java/com/ning/billing/util/customfield/dao/CustomFieldSqlDao.java
	util/src/test/java/com/ning/billing/util/customfield/dao/MockCustomFieldDao.java

Add missing payment stubs for pagination apis

Remove paid_through_date from the ddl

Fix TestDefaultSubscriptionApi after change of error code …

in entitlement

Add ability to delete (mark as deleted) custom fields

Fix wrong error code in entitlement

Add ability to update bundle externalKey

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

Fixes #153