Prosoft Git

killbill-memoizeit

<< < 403 404 405 406 407 > >>

Merge branch 'master' into migration Conflicts: analytics/src/test/java/com/ning/billing/analytics/MockIEntitlementUserApi.java api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EventSqlDao.java entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancel.java entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiDemos.java entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiScenarios.java entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java

12/26/2011 11:06:53 PM
stephane brossier

stephane brossier

Commit: fe0983f

Tree: d43dcbd

Parents: fb8b9fb
8045f49

[maven-release-plugin] prepare for next development iteration

12/22/2011 3:56:32 PM
Martin Westhead

Martin Westhead

Commit: 8045f49

Tree: bca625a

Parents: f1c0bcf

[maven-release-plugin] prepare release killbill-0.0.20

12/22/2011 3:56:25 PM
killbill-0.0.20
Martin Westhead

Martin Westhead

Commit: f1c0bcf

Tree: ff35b4a

Parents: 96b3e68

[maven-release-plugin] prepare for next development iteration

12/21/2011 8:49:47 PM
jeff

jeff

Commit: 96b3e68

Tree: e9007a4

Parents: 9478cee

[maven-release-plugin] prepare release killbill-0.0.19

12/21/2011 8:49:41 PM
killbill-0.0.19
jeff

jeff

Commit: 9478cee

Tree: bce66cb

Parents: b8e9e1a

[maven-release-plugin] prepare for next development iteration

12/21/2011 7:32:05 PM
jeff

jeff

Commit: b8e9e1a

Tree: fddd034

Parents: e41dbea

[maven-release-plugin] prepare release killbill-0.0.18

12/21/2011 7:31:56 PM
killbill-0.0.18
jeff

jeff

Commit: e41dbea

Tree: 64de6e2

Parents: 4712c0e

Merging changes with Jeff's

12/21/2011 6:54:17 PM
Martin Westhead

Martin Westhead

Commit: 4712c0e

Tree: 26228d5

Parents: 76e4b08
0a411d0

Allowing versioned catalog to be included in XML

12/21/2011 5:31:43 PM
Martin Westhead

Martin Westhead

Commit: 76e4b08

Tree: ae1c4c5

Parents: 1e1ab50

Migration bug fixes

12/26/2011 10:13:57 PM
stephane brossier

stephane brossier

Commit: fb8b9fb

Tree: 3d7b49b

Parents: ebb0762

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github