Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 

* 'engine-api' of https://github.com/arangodb/arangodb:
  fix anchor
  added jemalloc
This commit is contained in:
Jan Christoph Uhde 2017-04-20 10:57:05 +02:00
parent 7889291247 95e0e17f75
commit ae66bca13c
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/Books/Manual/Appendix/References/CollectionObject.mdpp
View File

@ -11,7 +11,6 @@ The following methods exist on the collection object (returned by *db.name*):
* [collection.figures()](../../DataModeling/Collections/CollectionMethods.md#figures)
* [collection.load()](../../DataModeling/Collections/CollectionMethods.md#load)
* [collection.properties()](../../DataModeling/Collections/CollectionMethods.md#properties)
* [collection.reserve()](../../DataModeling/Collections/CollectionMethods.md#reserve)
* [collection.revision()](../../DataModeling/Collections/CollectionMethods.md#revision)
* [collection.rotate()](../../DataModeling/Collections/CollectionMethods.md#rotate)
* [collection.toArray()](../../DataModeling/Documents/DocumentMethods.md#toarray)

15
LICENSES-OTHER-COMPONENTS.md
View File

@ -50,6 +50,21 @@
* Project Home: http://site.icu-project.org/
* License: [ICU License](https://github.com/arangodb/arangodb/blob/devel/3rdParty/V8/v5.7.0.0/third_party/icu/LICENSE)
### jemalloc 4.5.0
* Project Home: https://github.com/jemalloc/jemalloc
* License: [free as-is license](https://raw.githubusercontent.com/jemalloc/jemalloc/dev/COPYING)
The generated files config.guess and config.sub have the explicit
exception from the GPL license:
As a special exception to the GNU General Public License, if you
distribute this file as part of a program that contains a
configuration script generated by Autoconf, you may include it under
the same distribution terms that you use for the rest of that
program. This Exception is an additional permission under section 7
of the GNU General Public License, version 3 ("GPLv3").
### linenoise-ng
* GitHub: https://github.com/arangodb/linenoise-ng