Jan Christoph Uhde 32d0bdc846 Merge branch 'devel' of github.com:arangodb/arangodb into obi-geo-index ... * 'devel' of github.com:arangodb/arangodb: (132 commits) try to fix travis build Generate unique Swagger operationIds Add support for Swagger tags Add swagger route to Foxx API Require at least one arg in route def ported velocypack compatibility fix from arangodb/velocypack use bulk allocator for index elements fix memleak fix test in cluster remove unused code fixed resilience Update zwagger Readd satellite node Fix link Document OAuth1 Nicer OAuth2 docs properly start the tarball fix VS compile errors clones method in Jobs more useful we don't need the dpkg-shlibdeps workaround anymore. ...		2016-12-12 09:15:36 +01:00
..
actions	fixed faulty output when primary db server from changeSecondary api could not be found	2016-11-30 11:27:54 +01:00
apps/system	Add swagger route to Foxx API	2016-12-12 02:32:49 +01:00
client	redirects to myelf should be hinstory	2016-12-06 18:05:05 +01:00
common	Wait for synchronous replication to settle	2016-12-07 18:38:15 +01:00
contrib	…
node	Bump graphql-sync to 0.6.x compat	2016-11-06 13:30:03 +01:00
server	Merge branch 'devel' of github.com:arangodb/arangodb into obi-geo-index	2016-12-12 09:15:36 +01:00
.eslintrc	added rule to eslint conf	2016-11-15 14:40:21 +01:00
.jshintrc	try avoiding "line too long" errors	2016-05-13 13:16:05 +02:00
GUIDELINES.md	…