killbill-aplcache

<< < 266 267 268 269 270 > >>

Fix broken tests after merge

6/9/2012 9:45:32 PM

stephane brossier

Commit: 192026a

Tree: efe8620

Parents: cf800a3

Merge remote branch 'origin/integration' into server Conflicts: analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubscriptions.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonWithBundleKeys.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java jaxrs/src/main/java/com/ning/billing/jaxrs/resources/ChargebackResource.java payment/src/main/java/com/ning/billing/payment/bus/TagHandler.java

6/9/2012 8:44:01 PM

stephane brossier

Commit: cf800a3

Tree: 5cd8910

Parents: d6dc6fb
dc1337c

server: enable most tests in TestChargeback Disable only …

6/8/2012 10:28:57 PM

the POST test which requires the payment resources.

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

Pierre-Alexandre Meyer

Commit: dc1337c

Tree: 6bf700a

Parents: 83fa033

server: fix test failure Signed-off-by: Pierre-Alexandre …

6/8/2012 10:25:21 PM

Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 83fa033

Tree: 06a5094

Parents: c7f2dfa

jaxrs: use compareTo to compare BigDecimal objects Reported-by: …

6/8/2012 10:02:45 PM

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

Pierre-Alexandre Meyer

Commit: c7f2dfa

Tree: 23c1b4e

Parents: c27df43

server: update Credit tests to latest CreditJson Tests now …

6/8/2012 9:58:14 PM

pass.

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

Pierre-Alexandre Meyer

Commit: c27df43

Tree: 3312877

Parents: d8d086b

Merge branch 'integration' of github.com:ning/killbill …

6/8/2012 9:40:16 PM

into integration

Pierre-Alexandre Meyer

Commit: d8d086b

Tree: e63d7a6

Parents: f255c62
cc216a7

Added accountId to CreditJson and CreditCollectionJson

6/8/2012 9:35:02 PM

alena

Commit: cc216a7

Tree: 309dc21

Parents: b1a95c0

jaxrs: use compareTo to compare DateTime objects Reported-by: …

6/8/2012 9:36:40 PM

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

Pierre-Alexandre Meyer

Commit: f255c62

Tree: 84c46a0

Parents: c979198

server: use full path to catalog Avoid relative path issues …

6/8/2012 9:34:58 PM

and use the full path instead.

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

Pierre-Alexandre Meyer

Commit: c979198

Tree: b73dd93

Parents: e511f13