killbill-memoizeit

<< < 17 18 19 20 21 > >>

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

6/25/2014 12:25:57 AM

stephane brossier

Commit: b40c25f

Tree: bd7fde0

Parents: 30788a3
b2ce174

Merge remote-tracking branch 'origin/master' into iKentoo-master

6/22/2014 9:58:38 AM

Pierre-Alexandre Meyer

Commit: b2ce174

Tree: f78b422

Parents: c9f9afb
dbb9bac

Merge branch 'master' of github.com:iKentoo/killbill into …

6/22/2014 9:45:14 AM

iKentoo-master

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

Conflicts:
	beatrix/pom.xml
	invoice/src/main/java/org/killbill/billing/invoice/glue/DefaultInvoiceModule.java
	invoice/src/test/java/org/killbill/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
	invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java
	osgi-bundles/bundles/jruby/pom.xml
	osgi-bundles/bundles/logger/pom.xml
	osgi-bundles/libs/killbill/src/main/java/org/killbill/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
	osgi/pom.xml
	osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java
	osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java
	util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java

Pierre-Alexandre Meyer

Commit: c9f9afb

Tree: 15285ad

Parents: ac42a25
5a752a6

Merge remote-tracking branch 'upstream/osgi-shiro'

6/5/2014 11:37:33 AM

val

Commit: 5a752a6

Tree: 79d9235

Parents: 194d04d
ca5d262

security: implement DefaultSecurityApi#logout() Signed-off-by: …

6/5/2014 10:38:25 AM

Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: ca5d262

Tree: 0913986

Parents: 030c15f

Merge remote-tracking branch 'upstream/osgi-shiro'

6/2/2014 11:55:50 PM

val

Commit: 194d04d

Tree: 1041eaf

Parents: bc9d7a5
030c15f

osgi: export SecurityApi to bundles Signed-off-by: Pierre-Alexandre …

6/2/2014 11:31:35 AM

Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: 030c15f

Tree: 06d75ef

Parents: 789ed9f

#201: Ability to use localized email subject

6/2/2014 10:02:01 AM

val

Commit: bc9d7a5

Tree: 355dd28

Parents: 8c05dff

Added InvoicePluginApi: ability to add additional items to …

5/22/2014 7:47:38 AM

invoices before sealing

val

Commit: 8c05dff

Tree: d1a273e

Parents: 2b5341d

Added InvoicePluginApi: ability to add additional items to …

5/22/2014 7:45:44 AM

invoices before sealing

val

Commit: 2b5341d

Tree: 23c1893

Parents: 789ed9f