soledad.git, branch release/0.6.x [soledad] Fold in changes. 2015-04-09T17:39:05+00:00 drebs drebs@leap.se 2015-04-09T17:39:05+00:00 bbb19ed9a755a079da5b79567cb98a921c02f2f4 






[fix] remove unneded params to CouchServerState
2015-04-09T17:34:31+00:00

drebs
drebs@leap.se

2015-04-09T15:20:19+00:00

1edacb035f0fc65ca26f8b1324b5cff6fdabf7bf

This commit removes some leftover code from a time when Soledad Server used to
check for permissions on certain databases when starting (i.e. shared and
tokens databases). This was later removed as correct permissions enforcement
was relayed to tapicero.

Closes: #6833.





This commit removes some leftover code from a time when Soledad Server used to
check for permissions on certain databases when starting (i.e. shared and
tokens databases). This was later removed as correct permissions enforcement
was relayed to tapicero.

Closes: #6833.







Merge tag '0.6.4' into release/0.6.x
2015-04-09T17:30:11+00:00

drebs
drebs@leap.se

2015-04-09T17:30:11+00:00

4a8413505faf70138f5b16dc4a845c4e0219b872

version 0.6.4





version 0.6.4







Bail out ddocs installation if the path doesn't exist. Fix: #6671
2015-01-23T19:36:08+00:00

Kali Kaneko
kali@leap.se

2015-01-23T18:54:08+00:00

9c527fe9aa6ceaa7ed380a31ac4e1e4bfdc566dd

Conflicts:
	common/MANIFEST.in





Conflicts:
	common/MANIFEST.in







Fold in changes.
2014-12-16T15:05:19+00:00

drebs
drebs@leap.se

2014-12-16T15:05:19+00:00

b44103de55cd9d2f347c344c23d71cb87d8d06cb












Merge remote-tracking branch 'drebs-github/bug/6500_fix-deferred-enc-dec' into release/0.6.x
2014-12-15T18:49:36+00:00

Kali Kaneko
kali@leap.se

2014-12-15T18:49:36+00:00

ef0d008b53ac214dc77fe572f2cc5d18efbd1b35












Fix deferred enc/dec params and fallback (#6500).
2014-12-15T17:55:25+00:00

drebs
drebs@leap.se

2014-12-15T17:55:25+00:00

a7abb6eb3fe9a0a904bcabd0bf344637e9fd4e62












Merge branch 'release-0.6.2' into release/0.6.x
2014-12-11T18:49:53+00:00

drebs
drebs@leap.se

2014-12-11T18:49:53+00:00

969851741dfd23981a74da07dbb565299e55815f












Fix incorrect ssl context setup
2014-12-11T18:49:35+00:00

Kali Kaneko
kali@leap.se

2014-12-09T22:07:17+00:00

dafcfac4663d00ee2049b0a245c2ecb84ef2bad5

The changes introduced in aafa79c0f5 having to do with the cert
verification are incorrect, regarding the use of the newest ssl context
api introduced in python 2.7.9. There the use of the server setup was
taken, instead of the correct client options.

I hereby apologize for the insuficient testing on that fix. It happens
that I wrongly tested in an evironment that did the fallback to
pre-2.7.9 interpreter.





The changes introduced in aafa79c0f5 having to do with the cert
verification are incorrect, regarding the use of the newest ssl context
api introduced in python 2.7.9. There the use of the server setup was
taken, instead of the correct client options.

I hereby apologize for the insuficient testing on that fix. It happens
that I wrongly tested in an evironment that did the fallback to
pre-2.7.9 interpreter.







Merge branch 'release-0.6.1' into release/0.6.x
2014-12-08T16:37:29+00:00

drebs
drebs@leap.se

2014-12-08T16:37:29+00:00

7496a78b2d82d27a7b2470f5393f0e531ef75360