diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-22 15:23:45 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-22 15:23:45 +0200 |
| commit | 856476d4418390ca89ef161e31faf61248eeaa1d (patch) | |
| tree | f87ab29316440a28e9032d1b811eeb7ea5155653 /doc | |
| parent | 4b812d9965128b02b4ac5ea49a66da622953cddc (diff) | |
| parent | b1b700adb1f26bb43e8f4b77b85f969a4b52d36c (diff) | |
[MERGE] forward port branch saas-12 up to b1b700a
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/orm.rst | 4 | ||||
| -rw-r--r-- | doc/reference/upgrade_api.rst | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst index 86869b529f1..6a017d24e80 100644 --- a/doc/reference/orm.rst +++ b/doc/reference/orm.rst @@ -130,6 +130,10 @@ preserve order. * ``record in set`` returns whether ``record`` (which must be a 1-element recordset) is present in ``set``. ``record not in set`` is the inverse operation +* ``set1 <= set2`` and ``set1 < set2`` return whether ``set1`` is a subset + of ``set2`` (resp. strict) +* ``set1 >= set2`` and ``set1 > set2`` return whether ``set1`` is a superset + of ``set2`` (resp. strict) * ``set1 | set2`` returns the union of the two recordsets, a new recordset containing all records present in either source * ``set1 & set2`` returns the intersection of two recordsets, a new recordset diff --git a/doc/reference/upgrade_api.rst b/doc/reference/upgrade_api.rst index 567d8aa29fc..04edf919e83 100644 --- a/doc/reference/upgrade_api.rst +++ b/doc/reference/upgrade_api.rst @@ -341,7 +341,7 @@ The ``request_sftp_access`` method returns a JSON dictionary containing the foll SSH_KEYS=/path/to/your/authorized_keys KEY="Aw7pItGVKFuZ_FOR3U8VFQ==" REQUEST_ID="10534" - URL_PARAMS="key=${KEY}&request=${REQUEST}" + URL_PARAMS="key=${KEY}&request=${REQUEST_ID}" curl -sS "${REQUEST_SFTP_ACCESS_URL}?${URL_PARAMS}" -F ssh_keys=@${SSH_KEYS} > request_sftp_result.json |