Jan Steemann
6dfa6693c8
added test for first/last after reload
2013-07-23 08:59:31 +02:00
Frank Celler
97aa4f6597
cosmetics
2013-07-21 12:01:30 +02:00
Frank Celler
5aa74e9822
limit string on output
2013-07-21 10:17:51 +02:00
Jan Steemann
2a762ce1f7
replication logger tests
2013-07-19 17:22:06 +02:00
Jan Steemann
3ab117de67
added collection.first() and collection.last()
2013-07-19 14:21:46 +02:00
Jan Steemann
6d2daa05a3
test replication logger, initial commit
2013-07-19 11:28:17 +02:00
Jan Steemann
e359dc29dd
INCOMPATIBLE CHANGE: changed AQL user function namespace resolution operator from `:` to `::`
...
AQL user-defined functions were introduced in ArangoDB 1.3, and the namespace resolution
operator for them was the single colon (`:`). A function call looked like this:
RETURN mygroup:myfunc()
The single colon caused an ambiguity in the AQL grammar, making it indistinguishable from
named attributes or the ternary operator in some cases, e.g.
{ mygroup:myfunc ? mygroup:myfunc }
The change of the namespace resolution operator from `:` to `::` fixes this ambiguity.
Existing user functions in the database will be automatically fixed when starting ArangoDB
1.4 with the `--upgrade` option. However, queries using user-defined functions need to be
adjusted on the client side to use the new operator.
2013-07-18 12:02:28 +02:00
Jan Steemann
5cf234b40d
simplified query testing and query interface a bit
2013-07-18 02:15:22 +02:00
Jan Steemann
08b9f57166
stoppable replication applier
2013-07-17 10:58:10 +02:00
Jan Steemann
b5e26235a7
replication configuration
2013-07-12 17:37:24 +02:00
Jan Steemann
98dd1c2522
moved replication parts into separate files
2013-07-11 14:44:09 +02:00
Jan Steemann
3cc4405c18
added collection.checksum()
2013-07-10 11:10:00 +02:00
Jan Steemann
c6ff61b159
added new error code
2013-07-09 12:33:10 +02:00
Jan Steemann
054ed3ca3f
apply collection data dumps
2013-07-05 11:41:37 +02:00
Jan Steemann
230f0ddcc3
added errors
2013-07-04 15:51:24 +02:00
Jan Steemann
f5968a4646
handle a master's state response
2013-07-04 10:13:09 +02:00
Jan Steemann
fa69af4206
added wait time for rotate test
2013-07-03 16:42:58 +02:00
Jan Steemann
44c9ca4e90
issue #565 , plus a few usability fixxes for aal.search()
2013-07-03 14:06:57 +02:00
Jan Steemann
9d2a016c5b
make jslint happy
2013-07-01 15:50:51 +02:00
Lucas Dohmen
7e7a90753a
Fixing the build (this time: Really)
...
Sorry, seems like I shouldn't code today 😊
2013-06-28 19:38:30 +02:00
Lucas Dohmen
ccf56dd702
Fix the build
2013-06-28 18:34:26 +02:00
Lucas Dohmen
79a6772667
Code Review: Common Graph Module
2013-06-28 18:14:23 +02:00
Jan Steemann
4ed7ac6376
improved error messages
2013-06-27 14:49:33 +02:00
Jan Steemann
f7fcd6119d
added tests for special collections
2013-06-26 17:46:43 +02:00
Jan Steemann
af39f069f5
added more tests for hash index queries
2013-06-26 16:50:52 +02:00
Jan Steemann
27bf4bb546
more tests
2013-06-24 17:04:32 +02:00
Jan Steemann
adfd051c92
added test for unloading
2013-06-24 13:55:51 +02:00
Jan Steemann
93f7122099
added missing count() method for server-side cursor
2013-06-24 13:50:03 +02:00
Jan Steemann
5a9a13da8f
fixed test, updated docs
2013-06-24 10:58:07 +02:00
Jan Steemann
4c88adc054
potential fix for issue #554
2013-06-24 10:46:13 +02:00
Jan Steemann
4e7a09c33f
added one more test
2013-06-22 03:07:00 +02:00
Jan Steemann
654ea77f25
extended cap constraints with size constraints
2013-06-22 02:44:48 +02:00
Jan Steemann
2d7edbef96
added db._exists()
2013-06-21 21:50:00 +02:00
Jan Steemann
c74c80d5ff
allow bind parameters in db._query()
2013-06-21 17:13:51 +02:00
Jan Steemann
cae82f27e4
added `/_api/current-database`
2013-06-21 10:25:15 +02:00
Jan Steemann
e232e50bf6
fixed client-side test
2013-06-20 19:34:41 +02:00
Jan Steemann
f06012ac65
added tests for big documents
2013-06-20 19:14:47 +02:00
Jan Steemann
959bb653e2
fixed tests
2013-06-20 19:14:35 +02:00
Jan Steemann
b1f243d296
fixed segfault for too big shapes, make shape collection filesize adaptive
2013-06-20 19:14:14 +02:00
Jan Steemann
d9c0d588f9
added internal.adminDirectory
2013-06-20 15:47:48 +02:00
Lucas Dohmen
f64c227b16
Graph Module: Even more in Graph Common
2013-06-19 17:09:19 +02:00
Lucas Dohmen
6a84d4726b
Graph Module: Pulled Iterator into Common
...
Also adjusted it to be useful for the Server Side.
2013-06-19 17:09:19 +02:00
Lucas Dohmen
38327183e8
Graph Module: Edge almost entirely pulled into Common
2013-06-19 17:09:18 +02:00
Jan Steemann
74b3055747
added stub tests for functions
2013-06-19 16:51:50 +02:00
Jan Steemann
9dfb7483ff
"doCompact" attribute for collections
2013-06-19 16:51:16 +02:00
Lucas Dohmen
294b31e839
Further Refactoring of GraphCommon
2013-06-14 10:13:17 +02:00
Lucas Dohmen
c357fa1133
Pulled addVertex into Common + tiny style fixes
2013-06-14 10:13:17 +02:00
Lucas Dohmen
a81a0f0728
Tiny Refactoring of GraphCommon
2013-06-14 10:11:19 +02:00
Lucas Dohmen
222db29812
More functionality for the tiny is.x library
2013-06-14 10:11:19 +02:00
Jan Steemann
74d2a00737
test internal.download()
2013-06-13 15:05:08 +02:00
Jan Steemann
b1bc9b3285
adjust traversal docs and examples
2013-06-13 13:06:48 +02:00
Jan Steemann
9599a021b9
moved some graph traversal validation into the traversal module
...
- that simplifies some of the traversal-calling routines
- make returning error codes more consistent (specific 404 errors when
referring to unknown collections instead of simple 400 errors)
- optionally limit traversals to a certain number of iterations so they
don't run endlessly in cyclic graphs
2013-06-12 17:04:47 +02:00
Jan Steemann
212117d3b4
graph traversal API tests
2013-06-12 15:25:35 +02:00
Jan Steemann
68c3b02ffb
added a test for rotate()
2013-06-12 13:09:46 +02:00
Oreste Panaia
81f20c7ba0
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-06-12 17:03:29 +08:00
Jan Steemann
005f9f6c6f
add safety
2013-06-11 18:31:58 +02:00
Jan Steemann
e8e10844f4
moved compaction tests
2013-06-11 10:41:40 +02:00
Jan Steemann
564523896a
compaction tests
2013-06-11 10:10:58 +02:00
Oreste Panaia
35ab2e6f62
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-06-10 17:05:58 +08:00
Lucas Dohmen
567a548cff
Tearing appart Graph#addEdge and fixing the build even harder
2013-06-07 14:56:08 +02:00
Jan Steemann
f619c7f51e
jslint
2013-06-07 14:48:39 +02:00
Jan Steemann
fe26fa593e
jslint
2013-06-07 14:20:50 +02:00
Lucas Dohmen
5aadaf1b99
Restructering Graph Module, fixing the build
2013-06-07 13:51:22 +02:00
Lucas Dohmen
8e27de26a7
Fix for #546
2013-06-07 10:19:37 +02:00
Oreste Panaia
8a95c1c2a8
update
2013-06-05 19:52:34 +08:00
Oreste Panaia
70bc62a5a5
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-05-21 17:47:22 +08:00
Oreste Panaia
b764b4f71e
extended errors for skiplist
2013-05-21 17:45:19 +08:00
Frank Celler
b4794e6655
fixed issue #530 : ReferenceError: ArangoError is not a constructor
2013-05-20 00:02:25 +02:00
Jan Steemann
ed77c19e16
added derived file
2013-05-17 15:59:58 +02:00
Jan Steemann
c2ff93e99d
issue #531 (warning)
2013-05-17 14:58:22 +02:00
Jan Steemann
8790a69b8e
jslint
2013-05-14 12:40:30 +02:00
Jan Steemann
c51f70de05
removed hard-coded groups from statistics web interface
...
now all statistics are dynamic
removed redundant code in statistics web interface
2013-05-14 02:36:01 +02:00
Jan Steemann
a646e26105
bumped version number
2013-05-13 09:08:09 +02:00
Jan Steemann
841d7d7355
English
2013-05-10 14:06:15 +02:00
Jan Steemann
c0dbfb4136
issue #517
2013-05-08 20:58:55 +02:00
Jan Steemann
eb8325ef34
fixed typo in error message
2013-05-08 11:10:34 +02:00
Jan Steemann
ede177aa55
issue #507 , issue #508
2013-05-06 09:40:28 +02:00
Frank Celler
2d5af26466
added safeJoin
2013-05-05 21:50:43 +02:00
Frank Celler
581c667a5a
fixed jslint
2013-05-04 21:52:09 +02:00
Jan Steemann
bfb35a4b3c
issue #495
2013-05-03 11:38:10 +02:00
Jan Steemann
eef611b1da
fixed some compiler & jslint warnings
2013-05-03 11:09:45 +02:00
Jan Steemann
ee7ab712d6
issue #495
2013-05-03 11:08:58 +02:00
Lucas Dohmen
e14c8800cc
Added Underscore as Module for now
...
We want it to work, so be it.
2013-04-30 09:27:17 +02:00
Oreste Panaia
115d87196c
sync windows dev
2013-04-29 23:13:06 +08:00
Oreste Panaia
c42c0bf565
sync dev for windows
2013-04-29 21:49:28 +08:00
Oreste Panaia
532c7eae8e
windows dev update
2013-04-29 21:24:57 +08:00
Frank Celler
186694dc22
added safety check for packages which define main with .js
2013-04-23 22:42:11 +02:00
Frank Celler
fb8d8799c3
moved document of console to JSModuleConsole, added packages and node
2013-04-23 18:39:25 +02:00
Oreste Panaia
1ddbd2e4d9
update
2013-04-23 19:02:46 +08:00
Oreste Panaia
b83d90f021
skiplist transaction support
2013-04-23 18:56:26 +08:00
Frank Celler
cbc2ab93ba
fixed _shallowCopy, fixed creating of unknown attributes
2013-04-22 16:48:36 +02:00
Frank Celler
d02d79ce1c
added coffee-script
2013-04-21 22:57:19 +02:00
Frank Celler
7bfce45ece
added more node modules
2013-04-21 22:00:54 +02:00
Frank Celler
df03d38ee2
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-21 21:46:00 +02:00
Frank Celler
a75736a148
added Buffer from node
2013-04-21 21:45:39 +02:00
Frank Celler
d2ea4e9bd2
added SlowBuffer from node
2013-04-21 21:32:32 +02:00
Jan Steemann
c8f0236f7e
added test for numeric attribute names
2013-04-19 12:02:39 +02:00
Jan Steemann
b4d115fd4d
commented
2013-04-17 14:26:44 +02:00
Frank Celler
79330daa90
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-17 10:47:35 +02:00
Frank Celler
68a7a55c6d
fixed typo (plattform)
2013-04-17 10:46:53 +02:00
Jan Steemann
7d9777f8c5
extended API for user-defined AQL functions
2013-04-16 18:32:19 +02:00
Jan Steemann
15026e9a96
fixed examples
2013-04-16 16:16:28 +02:00
Jan Steemann
b667e458fc
fixed error messages
2013-04-16 11:55:17 +02:00
Jan Steemann
c945dbd2cd
updated transaction API
2013-04-15 11:54:36 +02:00
Jan Steemann
e3d8db0b71
issue #474
2013-04-15 09:30:50 +02:00
Jan Steemann
dee5adb9f5
added client side API for transactions
2013-04-12 23:18:48 +02:00
Jan Steemann
9b5849f650
updated documentation
2013-04-12 00:42:02 +02:00
Jan Steemann
229893c086
documentation for transactions
2013-04-12 00:03:05 +02:00
Jan Steemann
997c14e032
fixed jslint warnings
2013-04-11 20:24:09 +02:00
Jan Steemann
b6925a7b7b
transactions
2013-04-11 19:06:55 +02:00
Frank Celler
f373615268
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
...
Conflicts:
arangod/V8Server/v8-actions.cpp
2013-04-10 21:47:51 +02:00
Frank Celler
828b939053
fixed isolates, made ArangoError internal
2013-04-10 21:22:09 +02:00
Jan Steemann
ffb2a0f545
added generated file
2013-04-10 08:51:55 +02:00
Frank Celler
d7443f5caa
default path needs the type
2013-04-08 16:23:57 +02:00
Frank Celler
738a4dde75
nicer printing of objects
2013-04-08 16:23:28 +02:00
Frank Celler
b71f31bcbb
fixed wrong error message
2013-04-06 23:43:25 +02:00
Frank Celler
a0278476da
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
...
Conflicts:
lib/Basics/StringUtils.cpp
2013-04-06 10:19:09 +02:00
Frank Celler
1d7ee507e2
added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING
2013-04-06 10:18:29 +02:00
Jan Steemann
3a8783b26a
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-04-05 15:35:23 +02:00
Jan Steemann
edf513551f
error handling
2013-04-05 15:35:08 +02:00
Frank Celler
b50bc6dd24
added thumbnail
2013-04-05 14:48:15 +02:00
Frank Celler
71bf83be1b
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-05 13:25:04 +02:00
Frank Celler
0ea88d8ebf
use different sandbox
2013-04-05 13:24:55 +02:00
Jan Steemann
ed10d9b6aa
AQL user functions
2013-04-05 12:50:44 +02:00
Jan Steemann
31f4edde25
added test case
2013-04-05 11:28:57 +02:00
Lucas Dohmen
8515b6df9c
Foxx: Adjusted Tests to @fceller's changes
2013-04-05 10:01:58 +02:00
Frank Celler
dcb65a92bf
fixed error messages
2013-04-04 23:19:27 +02:00
Frank Celler
37e134ff50
new Foxx
2013-04-04 18:56:38 +02:00
Lucas Dohmen
33fd20ea51
Foxx: Introducing Repositories
2013-04-04 13:42:12 +02:00
Lucas Dohmen
d4d2957d9a
Foxx: Introducing Model
2013-04-04 11:17:22 +02:00
Jan Steemann
1417def879
disallow create/drop/rename operations inside transactions
2013-04-04 09:41:44 +02:00
Frank Celler
a6be9ceaa3
added node assert module
2013-04-03 16:48:38 +02:00
Frank Celler
0ba6329a12
added trace
2013-04-03 16:32:04 +02:00
Frank Celler
e68080a638
fixed wrong call to length
2013-04-03 16:31:53 +02:00
Lucas Dohmen
0b7b34d09b
Foxx: Breaking API Changes 💣
...
* Removed the old concept of models entirely.
* Manifest Files
* models has been removed
* Uses lib now as base path for all requires
* FoxxApplication is now called Application
* Changes to Application:
* requiresLibs is now requires
* requiresModels has been removed
2013-04-03 14:56:17 +02:00
Frank Celler
0c1e20cb1b
fixed wrong import
2013-04-02 18:28:35 +02:00
Frank Celler
7e7eefe4f6
use function to set result
2013-04-02 18:25:54 +02:00
Frank Celler
711b5884d3
Merge branch 'devel' of github.com:triAGENS/ArangoDB into HEAD
2013-04-02 17:47:33 +02:00
Frank Celler
42b92c794f
fixed error messages and tests
2013-04-02 17:46:19 +02:00
Frank Celler
3512fa6ff0
fixed error handling
2013-04-02 15:00:55 +02:00
Jan Steemann
e2effff144
fixed doxygen errors
2013-04-02 09:34:06 +02:00
Frank Celler
bae6e3666e
fixed wrong name
2013-04-01 23:07:31 +02:00
Frank Celler
3921fd07c8
no strict for assign
2013-03-31 19:32:25 +02:00
Frank Celler
74166761a1
Merge branch 'feature/commonjs' of github.com:triAGENS/ArangoDB into devel
2013-03-31 12:50:18 +02:00
Frank Celler
7def1cf29f
Merge remote-tracking branch 'origin/feature/commonjs' into devel
...
Conflicts:
apps/aardvark/manifest.json
apps/aardvark/manifestComplete.json
etc/arangodb/arangod.conf.in
etc/relative/arangod.conf
html/admin/js/bootstrap/module-internal.js
js/apps/aardvark/assets/collections/foxxCollection.js
js/apps/aardvark/assets/index.html
js/apps/aardvark/assets/lib/backbone.js
js/apps/aardvark/assets/lib/jquery.js
js/apps/aardvark/assets/lib/underscore.js
js/apps/aardvark/assets/models/foxx.js
js/apps/aardvark/assets/views/foxxListView.js
js/apps/aardvark/assets/views/foxxView.js
js/apps/aardvark/index.html
js/apps/aardvark/manifest.json
js/common/bootstrap/module-internal.js
2013-03-31 12:46:16 +02:00
Frank Celler
07bd4b2585
new module/package mechanism
2013-03-31 12:25:12 +02:00
Frank Celler
7031210a53
fixed browser
2013-03-31 00:10:48 +01:00
Frank Celler
1467b78676
cleanup of internal, fs, console
2013-03-31 00:10:48 +01:00
Frank Celler
b224a399ae
nice function printing
2013-03-31 00:10:47 +01:00
Jan Steemann
a4bab2b264
framed
2013-03-29 02:01:34 +01:00
Jan Steemann
0807016cf5
printTable
2013-03-29 01:53:16 +01:00
Jan Steemann
82cbde7886
printTable()
2013-03-29 01:31:23 +01:00
Frank Celler
af7a1a2253
fixed wrong id
2013-03-28 23:04:41 +01:00
Frank Celler
3928975435
moved apps to js
...
Conflicts:
Makefile.in
2013-03-28 23:04:25 +01:00
Frank Celler
dfe3c22519
fixed wrong id
2013-03-28 22:46:14 +01:00
Frank Celler
ee2b40208c
moved apps to js
2013-03-28 22:41:42 +01:00
Frank Celler
2ed6b0145f
changed app-path and dev-app-path to be just one directory
2013-03-28 21:48:52 +01:00
Jan Steemann
03fcdf1aa0
fixed firstExample with _id & _key attributes
2013-03-28 16:22:29 +01:00
Lucas Dohmen
f1b5f20fab
Foxx: Also using ArangoDB Mimetype Lookup for the other way around
2013-03-28 14:01:04 +01:00
Lucas Dohmen
1daf7a8367
Foxx: Check the format of nicknames
2013-03-28 14:01:04 +01:00
Jan Steemann
b04c33f1ec
generate reverse map of mimetypes
2013-03-28 13:48:57 +01:00
Lucas Dohmen
8261a46577
Added a Mimetype
2013-03-28 13:25:30 +01:00
Frank Celler
e3990f19ab
added reload in dev mode
2013-03-27 16:42:32 +01:00
Lucas Dohmen
1aecbd3f84
Foxx: Nope, this should not be in the routing info
...
Don't ask me why I put it there.
2013-03-27 15:40:41 +01:00
Frank Celler
3ea5fbe121
added dev
2013-03-27 15:28:43 +01:00
Frank Celler
7a6cdcf9b1
changing to app-id
2013-03-27 15:05:08 +01:00
Frank Celler
db54d5453c
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-27 13:57:33 +01:00
Lucas Dohmen
eaf2559b25
Adjustments to Frank's changes
2013-03-27 13:55:39 +01:00
Frank Celler
96a14b0b6d
changed to appId
2013-03-27 13:43:04 +01:00
Lucas Dohmen
ee0278dcad
Foxx: Adjusted to the format of Swagger's parameters
2013-03-27 13:19:42 +01:00
Lucas Dohmen
fb4a223cb0
Foxx: Introducing errorResponse
2013-03-27 13:19:41 +01:00
Lucas Dohmen
30f23c22e6
Foxx: Automatically add the httpMethod to the documentation
2013-03-27 13:19:41 +01:00
Lucas Dohmen
1494286143
Foxx: Introducing nickname, summary, notes
2013-03-27 13:19:41 +01:00
Lucas Dohmen
1466429e88
Foxx: Introducing queryParam
2013-03-27 13:19:41 +01:00
Lucas Dohmen
847783a151
Foxx: Bugfixes
2013-03-27 13:19:41 +01:00
Frank Celler
d8159a990e
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-27 11:32:52 +01:00
Frank Celler
be971602f2
added install and uninstall of FOXX apps
2013-03-27 11:32:39 +01:00
Jan Steemann
7a70cb3ed3
use property
2013-03-27 10:43:58 +01:00
Jan Steemann
59b6ef99ae
finalised mimetypes
2013-03-27 10:38:34 +01:00
Jan Steemann
3fd4fd984b
mimetypes w/ charsets
2013-03-27 10:31:30 +01:00
Jan Steemann
909c316e22
added mimetype generation file
2013-03-27 10:11:56 +01:00
Frank Celler
214c9d8386
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-26 17:47:40 +01:00
Frank Celler
111a0ed54a
write mounts into _aal
2013-03-26 17:47:32 +01:00
Lucas Dohmen
2f3894f715
Foxx: Introducing pathParam
2013-03-26 17:17:53 +01:00
Lucas Dohmen
f59084a433
Foxx: Introducing the new `constrain` concept
2013-03-26 17:17:53 +01:00
Lucas Dohmen
8940df0480
Removing Old Constraints
2013-03-26 17:17:53 +01:00
Jan Steemann
3bb251000c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
...
Conflicts:
lib/V8/v8-utils.cpp
2013-03-26 14:13:41 +01:00
Jan Steemann
1492118545
added test cases for "fs" module
2013-03-26 14:09:20 +01:00
Frank Celler
a8d9a14e7d
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-26 13:58:20 +01:00
Frank Celler
557184631d
more fox-manager, added files section
2013-03-26 13:58:00 +01:00
Lucas Dohmen
517b530684
Foxx: Default '/' to index.html
2013-03-26 11:27:22 +01:00
Lucas Dohmen
e0bf7018fc
Foxx: Add the `del` alias for `delete`
...
Aliasing in JavaScript is a sickness.
2013-03-26 11:27:21 +01:00
Frank Celler
0f6e48a38b
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
...
Conflicts:
js/server/modules/org/arangodb/foxx.js
2013-03-26 10:01:39 +01:00
Jan Steemann
f3bffb2553
fixed test that failed on the client
2013-03-25 17:29:29 +01:00
Jan Steemann
0e6c21e4e7
removed NEW_BORN collection status in server
2013-03-25 15:51:42 +01:00
Frank Celler
877066392e
foxx manager cleanup
2013-03-25 14:10:10 +01:00
Frank Celler
332b0495ca
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-25 10:22:44 +01:00
Frank Celler
a8557091b8
new foxx loader
2013-03-25 10:22:35 +01:00
Lucas Dohmen
74e23f8670
Foxx: Starting with the Foxx User Documentation
2013-03-25 09:50:54 +01:00
Jan Steemann
9cbd8e4707
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-03-24 18:13:26 +01:00