1
0
Fork 0
Commit Graph

20089 Commits

Author SHA1 Message Date
Michael Hackstein dec8a59073 Removed unused code 2015-03-13 09:44:02 +01:00
Michael Hackstein c1f463cdbb Fixed the upgrade script to maintain configuration of Apps 2015-03-13 08:55:38 +01:00
Michael Hackstein 63ef6ba1aa Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-12 17:48:01 +01:00
Michael Hackstein c3b350054b Fixed configuration of Foxx apps. It was not fully working in foxx manager 2015-03-12 17:47:56 +01:00
Heiko Kernbach 8a1e30b9d0 included 44fb5a554f1bbbf985724dbea92ed382f61a06be 2015-03-12 17:32:31 +01:00
Michael Hackstein 2f5818f5c3 The old configuration of an app is now maintained while issuing upgrade. It is thrown away while issuing replace 2015-03-12 17:26:39 +01:00
Jan Steemann 7ed7dd4bdf fixed VS compile errors 2015-03-12 17:05:39 +01:00
Jan Steemann 22dcbef6cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-12 16:53:26 +01:00
Heiko Kernbach 449e3f1a18 added query management view, kill running queries and show slow queries 2015-03-12 16:42:20 +01:00
Jan Steemann 29611a511f issue #1241: added configure option `allowNull` for visitor 2015-03-12 16:28:52 +01:00
Michael Hackstein 1e9fdc379f Added AQL queries test to makefile 2015-03-12 16:05:52 +01:00
Michael Hackstein 6e893826dc Further tests for api query analysis 2015-03-12 16:05:46 +01:00
Michael Hackstein 7eb685a5aa Added a test for the new query analysis api. 2015-03-12 16:05:40 +01:00
Jan Steemann 70ce59abb6 log when killing a query 2015-03-12 15:10:33 +01:00
Jan Steemann dfb70d7d96 added cancellation points
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-03-12 15:00:23 +01:00
Jan Steemann f035ea1c3b kill AQL queries
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-03-12 15:00:14 +01:00
Jan Steemann e67c82c8a4 added JavaScript APIs for query tracking 2015-03-12 13:02:14 +01:00
Jan Steemann 75c4451469 enable query tracking by default 2015-03-12 13:02:13 +01:00
Jan Steemann b98c4c2d5b added documentation, fixed potential UTF-8 truncation 2015-03-12 13:02:13 +01:00
Jan Steemann 64d77cbe24 added query tracking feature 2015-03-12 13:02:13 +01:00
Jan Steemann 342ed805e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-12 13:00:07 +01:00
Frank Celler 4545136e06 added --enable-gold 2015-03-12 12:27:47 +01:00
Michael Hackstein 08933b3c93 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-11 17:50:02 +01:00
Michael Hackstein 5be310fc21 It is now possible to install Apps that are invalid if they are not configured correctly. If they get broken by configuration they are still routed and will display an errorpage. They also display an errorpage until configured. 2015-03-11 17:49:42 +01:00
Alan Plum 5b277891a6 Fixed fixture. 2015-03-11 16:58:39 +01:00
Alan Plum 644a2dc415 Added fixtures for Foxx config errors. 2015-03-11 16:57:04 +01:00
Jan Steemann a6473338b3 optimization for extractKey 2015-03-11 15:26:08 +01:00
Willi Goesgens 4189fb1000 add more modern way of running testing.js 2015-03-11 15:23:13 +01:00
Willi Goesgens 019a2923fa Argparse:
- implement correct toArgv conversion for extraargs and valgrindargs.
2015-03-11 15:05:06 +01:00
Willi Goesgens a9d9b56992 Argsparser:
- fix parsing of sub-option arrays
  - add possibibility to serialize to '--longopt=value' instead of '--longopt' 'value'
2015-03-11 15:04:01 +01:00
Michael Hackstein aec928c094 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-11 14:12:39 +01:00
Michael Hackstein 43db734812 Started with a Foxx introduction 2015-03-11 14:12:31 +01:00
Willi Goesgens e092e9d8fb Add option to skip loganalysis; if run in trace mode, the logs can become huge. 2015-03-11 14:11:49 +01:00
Willi Goesgens cc5761ea68 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-11 13:49:38 +01:00
Willi Goesgens 384fa89953 Check for python version 2; V8 fails with 3. 2015-03-11 13:49:01 +01:00
Michael Hackstein 0a8e15749a Fixed scss-lint 2015-03-11 13:47:02 +01:00
Michael Hackstein 9b51551dfc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-11 13:43:47 +01:00
Michael Hackstein c30b8f7c37 Removed unnecessary chapter 2015-03-11 13:43:32 +01:00
Michael Hackstein b4910c2845 Added a conclusion section to foxx in a nutshell 2015-03-11 13:43:05 +01:00
Jan Steemann a185409de0 fixed warning 2015-03-11 12:55:47 +01:00
Jan Steemann a2d1f19e4e updated CHANGELOG 2015-03-11 12:19:45 +01:00
Jan Steemann c4f17bb244 issue #1265: arangod crashed with SIGSEGV 2015-03-11 12:19:34 +01:00
Jan Steemann b1be47f051 updated CHANGELOG 2015-03-11 10:23:12 +01:00
Jan Steemann 37bb6d6732 issue #1241: fixed passing `data` attribute into GRAPH_NEIGHBORS() function 2015-03-11 10:22:27 +01:00
Michael Hackstein cc28239ca3 Improved foxx in a nutshell chapter 2015-03-11 09:57:45 +01:00
Michael Hackstein 6ff88839e9 Removed unnecessary throw 2015-03-10 16:03:57 +01:00
Michael Hackstein 3a8fee211f The Foxx Comment preprocessor now trimes strings properly 2015-03-10 15:22:16 +01:00
Michael Hackstein a2e1e70d0f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-10 15:04:12 +01:00
Michael Hackstein aafd1feb9f Activated comments in Foxx Test 2015-03-10 15:04:07 +01:00
Michael Hackstein a3950cf8ba Improved testing js in combination with Jasmine 2015-03-10 15:03:50 +01:00