1
0
Fork 0
Commit Graph

25115 Commits

Author SHA1 Message Date
Jan Steemann 827176c3be fixed warnings 2016-01-05 14:28:02 +01:00
Jan Steemann edb4d2dc4c fix some VS compile errors 2016-01-05 14:10:10 +01:00
Jan Steemann c651a4b80f next attempt to fix MacOS build 2016-01-05 14:08:30 +01:00
Jan Steemann f00046c818 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-05 12:42:09 +01:00
Frank Celler 6fbe632d08 fixed comparison 2016-01-05 12:36:53 +01:00
Alan Plum 1b25f98996 On Windows, posix-ify mocha test paths 2016-01-05 11:32:21 +01:00
Jan Steemann c9649b60a9 updated clang-format with pointer alignment specification 2016-01-05 10:08:15 +01:00
Jan Steemann ba4c30bc47 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-05 09:33:48 +01:00
Jan Steemann b16efdc645 fixed CMakeLists for arangosh on Non-Linux 2016-01-05 09:33:19 +01:00
Jan Steemann 9a63b47adf Merge branch 'vpack' of https://github.com/arangodb/arangodb into devel 2016-01-05 09:21:09 +01:00
Frank Celler f5a88e1d17 only remove EXPERIMENTAL if present 2016-01-05 09:07:42 +01:00
jsteemann e5db136f99 internal function signature cleanup 2016-01-05 01:12:11 +01:00
Frank Celler ad11685034 fixed removal of EXPERIMENTAL 2016-01-05 00:42:20 +01:00
jsteemann 6745a5048e Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:24 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
jsteemann 8391084c15 less GC when idle 2016-01-05 00:24:32 +01:00
Jan Steemann c7f44b5f63 reserved AQL keyword `NONE` 2016-01-04 19:34:37 +01:00
Jan Steemann a15c18572f fixed test, added more tests 2016-01-04 19:33:18 +01:00
Jan Steemann a04993b4e4 turn off debug output 2016-01-04 19:12:34 +01:00
Jan Steemann 10f97380be updated documentation 2016-01-04 19:10:41 +01:00
Jan Steemann d6e05a2e19 added optional "startTime" attribute for handler description 2016-01-04 19:04:15 +01:00
Jan Steemann f207238e8a do not use workmonitor freelists for client tools 2016-01-04 18:43:51 +01:00
Jan Steemann 28d80cf8d4 fixed shutdown leak 2016-01-04 18:37:01 +01:00
Jan Steemann 2014d2552c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-04 16:38:33 +01:00
Jan Steemann 7b20e8da84 fixed typo 2016-01-04 16:37:01 +01:00
Wilfried Goesgens 8a4a3b49b9 Add explaination about bind parameters and string processing. AQL ain't javascript.
closes #1634
2016-01-04 16:34:43 +01:00
Jan Steemann c788cf9776 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-04 16:31:29 +01:00
Jan Steemann 555a0286c2 make merging configurable in update-by-example API 2016-01-04 16:31:06 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Jan Steemann 0d4874a2c9 added derived file 2016-01-04 15:07:04 +01:00
Jan Steemann 4001495101 updated documentation 2016-01-04 14:51:40 +01:00
Jan Steemann 76577f4332 fix inclusion of .arangosh.rc 2016-01-04 14:51:39 +01:00
Max Neunhoeffer 556c5b3371 Clarify documentation of minimal depth in Aql graph traversals. 2016-01-04 10:32:47 +01:00
Frank Celler f88ffb6e2e added boost libs for Darwin 2016-01-03 13:27:17 +01:00
Frank Celler f48f753881 Merge pull request #1642 from FuzzySockets/collections-and-docs-docs
fix extraneous word and fixup sentence in CollectionsAndDocuments.mdpp
2016-01-03 12:55:56 +01:00
Frank Celler 22033ad721 Merge pull request #1643 from FuzzySockets/cluster-mdpp
fix typos in Cluster.mdpp
2016-01-03 12:55:40 +01:00
Frank Celler b44c7ab64c Darwin fixes 2016-01-03 12:46:06 +01:00
jsteemann c20cf66e93 add cacheability info for explain 2016-01-03 00:52:36 +01:00
Richard Harrington 1ec61df712 fix typos in Cluster.mdpp 2016-01-02 16:23:53 -05:00
Richard Harrington 75cf49aa74 fix extraneous word and fixup sentence in CollectionsAndDocuments.mdpp 2016-01-02 16:19:11 -05:00
Frank Celler 9eb51e9a20 Merge pull request #1637 from kibarda/devel
documentation:regroup AQL stats, parsing and performance chapters
2016-01-02 18:06:02 +01:00
Frank Celler e78cef5e62 Merge pull request #1641 from FuzzySockets/foxx-manager-docs
replace "when connection" with "when connecting"
2016-01-02 18:03:15 +01:00
Richard Harrington 9ec73cc572 replace "when connection" with "when connecting" 2016-01-02 08:42:30 -05:00
jmvan 74ecf8ded2 documentation: links added 2015-12-30 11:18:23 +01:00
jmvan 5bdb97424e documentation:regroup AQL stats, parsing and performance chapters 2015-12-30 02:34:06 +01:00
jsteemann 9b64efbc11 added generated file 2015-12-29 15:58:29 +01:00
Alan Plum bdee7f3309 Fix cluster test
The implementation of `_.clone` in underscore naively clones all properties including inherited ones.
As lodash does The Right Thing and ignores the prototype, we need to flatten the object first.
2015-12-29 13:44:00 +01:00
Max Neunhoeffer 79b5175212 Add followerInfos in ClusterInfo. 2015-12-28 14:31:16 +01:00
Max Neunhoeffer f3b5b70b7b Clarify documentation of minimal depth in Aql graph traversals. 2015-12-28 10:00:19 +01:00
Alan Plum 223f96bb1b Merge pull request #1622 from arangodb/underscore2lodash
underscore -> lodash
2015-12-25 18:47:09 +01:00