lp:~zorba-coders/zorba/couchbase-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 11170

Cezar Andrei: Approve on 2013-01-09

Chris Hillery: Approve on 2013-01-09

Matthias Brantner: Approve on 2013-01-06

Diff: 28 lines (+4/-1)

2 files modified

ChangeLog (+3/-0)
modules/ExternalModules.conf (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

11137. By Chris Hillery on 2013-01-10

Merge from trunk.

11136. By Chris Hillery on 2013-01-09

Merge from trunk.

11135. By Chris Hillery on 2012-12-18

Merge from trunk.

11134. By Chris Hillery on 2012-12-18

Don't specify zorba-2.7 tag for Couchbase.

11133. By Juan Zacarias on 2012-11-22

Added couchbase module, to the changelog and ExternalModule.conf

11132. By [u'Sorin Marian Nasoi <email address hidden>', u'Markos Zaharioudakis <email address hidden>'] on 2012-11-21

Added FOTS driver. Approved: Markos Zaharioudakis, Nicolae Brinza, Ghislain Fourny, Chris Hillery, Cezar Andrei, Paul J. Lucas, Juan Zacarias, Sorin Marian Nasoi

11131. By [u'Markos Zaharioudakis <email address hidden>'] on 2012-11-20

Fixed bug in castable expr when the target type is xs:QName. Approved: Markos Zaharioudakis

11130. By [u'Paul J. Lucas <email address hidden>'] on 2012-11-19

Added timezone to InvalidTimezoneException. Approved: Sorin Marian Nasoi, Nicolae Brinza, Paul J. Lucas

11129. By [u'Paul J. Lucas <email address hidden>'] on 2012-11-18

Fixes in ATOMIC_CAST_MATRIX
 Approved: Markos Zaharioudakis

11128. By [u'Markos Zaharioudakis <email address hidden>'] on 2012-11-12

Added missing include in test_hashmaps.cpp; hopefully fixes compilation error on Windows Approved: Markos Zaharioudakis