killbill-aplcache

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

6/8/2012 11:57:45 PM

into integration

alena

Commit: 330819a

Tree: e145075

Parents: e22c8bf
dc1337c

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

6/8/2012 9:40:57 PM

into integration

alena

Commit: e22c8bf

Tree: 5b55ad5

Parents: 72a9b1a
cc216a7

Merge from integration; Reworked merge in AuditedCollectionDaoBase …

6/8/2012 7:51:17 PM

-> saveEntitiesFromTransaction with the same merge logic for now; Added accountId to CreditJson

alena

Commit: 72a9b1a

Tree: b3d389a

Parents: 3f47521
b1a95c0

Added accountId to CreditJson

6/8/2012 7:45:11 PM

alena

Commit: 3f47521

Tree: 8a71ab7

Parents: 7cca117

account: remove the ability to create tags during account creation/migration We …

6/11/2012 4:35:53 PM

currently don't have a use case for it and the code is broken anyways
as it doesn't check if the tag definition was already created.

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

Pierre-Alexandre Meyer

Commit: c1e0028

Tree: 3016071

Parents: abe29fd

account: add a simple test that creates an account with tags Signed-off-by: …

6/11/2012 2:32:58 PM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: abe29fd

Tree: c5ce434

Parents: 192026a

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