1
0
Fork 0
Commit Graph

4762 Commits

Author SHA1 Message Date
Frank Celler 2ac556d0f1 changed default 2013-02-18 10:06:36 +01:00
a-brandt 25882a3cd0 bugfix #410: Graph REST API returns "400:Bad request" instead of "404:Not found" 2013-02-18 09:28:03 +01:00
a-brandt 70b37864dd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-18 09:26:04 +01:00
a-brandt a78705a7c1 moved arangod.conf 2013-02-18 09:25:48 +01:00
Jan Steemann dead4cc737 fixed some typos 2013-02-18 09:19:47 +01:00
Frank Celler ced7b05cca added fix for TRI_ENABLE_LOGGING from Jan 2013-02-16 14:03:35 +01:00
Frank Celler 9836f3f349 fixed version number 2013-02-16 13:45:37 +01:00
Jan Steemann 694cb49918 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-15 17:55:58 +01:00
Jan Steemann 21e5a5e555 fixed typo in comment 2013-02-15 17:55:45 +01:00
Heiko Kernbach f6aad29f1f aboutview 2013-02-15 17:49:18 +01:00
Heiko Kernbach 61c4158fb0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-15 17:42:10 +01:00
Heiko Kernbach 77132cf01e footer 2013-02-15 17:41:55 +01:00
Heiko Kernbach cc7bc5174a footer 2013-02-15 17:10:28 +01:00
Jan Steemann f675bdc7dd fixed typo 2013-02-15 15:14:59 +01:00
Frank Celler 812948c896 Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel 2013-02-15 13:55:01 +01:00
a-brandt 20febde7c9 Merge branch '1.2' of github.com:triAGENS/ArangoDB into 1.2 2013-02-15 13:53:31 +01:00
Frank Celler 6044f9a381 removed generated files 2013-02-15 13:52:59 +01:00
a-brandt 3e24a8c212 moved the arangod.conf file 2013-02-15 13:51:57 +01:00
Frank Celler daf95bcf48 Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel 2013-02-15 13:51:39 +01:00
Frank Celler 82d59a4353 generated files 2013-02-15 13:50:52 +01:00
a-brandt 3b92c8ce09 deleted --gid X and --uid X 2013-02-15 13:49:20 +01:00
Frank Celler 2aa0694704 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 2013-02-15 13:48:37 +01:00
Frank Celler 697536faf5 restored README.md 2013-02-15 13:48:20 +01:00
Frank Celler 6eb44fafc1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 2013-02-15 13:45:04 +01:00
Jan Steemann c96dfba3ff make jslint happy 2013-02-15 13:44:43 +01:00
a-brandt 4ff839d5b7 Merge branch '1.2' of github.com:triAGENS/ArangoDB into 1.2 2013-02-15 13:44:03 +01:00
a-brandt ae22bae6a9 deleted --gid X and --uid X 2013-02-15 13:43:17 +01:00
Frank Celler 51c691a1cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-15 13:40:28 +01:00
Frank Celler adc3049a5f fixed relative tests 2013-02-15 13:40:19 +01:00
Frank Celler 9196343f30 fixed relative tests 2013-02-15 13:40:18 +01:00
Heiko Kernbach b80a9369db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-15 13:40:09 +01:00
Heiko Kernbach e7250325cb changes 2013-02-15 13:40:00 +01:00
Frank Celler 2b41083008 changed to from -nouid to -uid 2013-02-15 13:33:25 +01:00
Frank Celler 0876dff494 changed to from -nouid to -uid 2013-02-15 13:32:41 +01:00
Frank Celler 78ba7acb17 generated files 2013-02-15 13:22:02 +01:00
Frank Celler e7813c225d generated files 2013-02-15 13:17:03 +01:00
Frank Celler 8c7df98e28 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 2013-02-15 13:11:15 +01:00
Frank Celler 7072fab0f1 fixed merge error 2013-02-15 13:10:46 +01:00
Frank Celler a41ccc4d7e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-15 13:09:48 +01:00
Frank Celler 2147fb4b4e added arangod-nouid 2013-02-15 13:09:19 +01:00
Frank Celler cf2888b4fc Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
Conflicts:
	CHANGELOG
	Documentation/Manual/Upgrading12.md
	Installation/Linux/rc.arangod.OpenSuSE
2013-02-15 12:59:16 +01:00
Heiko Kernbach bdc6a9baa4 load/unload a collection 2013-02-15 12:48:22 +01:00
Heiko Kernbach c0e930292b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-15 12:32:27 +01:00
Heiko Kernbach 259f8131bd bugfix collection view 2013-02-15 12:32:18 +01:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Frank Celler 7b92dcc9bc fixed issue #405: 1.2 compile warnings 2013-02-15 11:57:35 +01:00
Frank Celler cf9a942417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
2013-02-15 11:52:53 +01:00
Frank Celler b1bd5827ad fixed issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:52:17 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Jan Steemann c64208de25 disable some statistics that are never queried 2013-02-15 11:36:53 +01:00