jsteemann
4b13da836c
fix g++ complaint about exceeding variable tracking size
2016-01-31 18:20:54 +01:00
jsteemann
4e94803ad7
honor results of clang-test, clang-tidy and clang-modernize
2016-01-31 15:56:18 +01:00
jmvan
03d8853a86
Documentation: Web Interface-bind parameter example added
2016-01-31 12:41:39 +01:00
jmvan
769080348c
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-01-31 12:40:27 +01:00
jsteemann
13481bbebc
fix or annotate problems identified by clang-check
2016-01-31 03:32:31 +01:00
jsteemann
d59595f1bf
fixed leak
2016-01-31 02:22:15 +01:00
jsteemann
2d7323a560
fixed warnings shown by clang-3.7
2016-01-31 02:17:36 +01:00
jmvan
5d12293262
Documentation: Parameters Binding links
2016-01-30 20:45:56 +01:00
jmvan
76e00ee0d9
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-01-30 20:39:55 +01:00
jmvan
ce8c8d454b
Documentation: Aql with ArangoDB Web Interface
2016-01-30 15:05:29 +01:00
jsteemann
ac634b9dab
fixed compile error in non-maintainer-mode
2016-01-30 14:38:31 +01:00
jsteemann
353c9732b7
removed last LOG_xxx macros
2016-01-30 04:03:18 +01:00
jsteemann
5bfd12a0ce
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-01-30 01:08:59 +01:00
jsteemann
dbd5c500cb
remove TRI_ENABLE_LOGGING
2016-01-30 00:46:40 +01:00
jsteemann
9482ee1cca
use Logger
2016-01-30 00:08:35 +01:00
jsteemann
00a68113b5
more files using the Logger
2016-01-29 23:45:10 +01:00
jsteemann
ff21453255
logger transition: all files in arangod exception transactions.cpp
2016-01-29 23:28:44 +01:00
Frank Celler
44a519b89e
added setLevel
2016-01-29 23:25:05 +01:00
jsteemann
dad0de602b
preparation for logging changes
2016-01-29 23:06:44 +01:00
Frank Celler
7fa5e6f008
removed shift
2016-01-29 22:28:22 +01:00
Frank Celler
468c1d06fb
added jslint test
2016-01-29 20:05:39 +01:00
Frank Celler
423a5420b2
splitted run and unittest scripts
2016-01-29 20:05:39 +01:00
Jan Steemann
c47eef63b5
added missing header
2016-01-29 20:05:16 +01:00
Jan Steemann
9bfa7e1101
updated CHANGELOG
2016-01-29 19:46:14 +01:00
Frank Celler
eef111f4ae
added Logger
2016-01-29 19:23:24 +01:00
Jan Steemann
828f46c76b
shut up compiler
2016-01-29 19:19:06 +01:00
Jan Steemann
cd4cbae6ce
ported fixes to devel
2016-01-29 19:05:27 +01:00
Wilfried Goesgens
8afc46134b
update to swagger V 2.1.4
2016-01-29 17:33:19 +01:00
Michael Hackstein
e0f0a6f1a8
Merge branch 'devel' of github.com:arangodb/arangodb into vpack
2016-01-29 14:18:05 +01:00
Max Neunhoeffer
09f974d660
Fix a merge.
2016-01-29 14:10:35 +01:00
Michael Hackstein
436c377cb5
Merge branch 'devel' of github.com:arangodb/arangodb into vpack
2016-01-29 14:01:53 +01:00
Max Neunhoeffer
238937128a
Merge branch 'devel' into ClustUp2
2016-01-29 13:59:11 +01:00
Max Neunhoeffer
dcf4ed8bca
Sort out FollowerInfo.
2016-01-29 13:56:37 +01:00
Alan Plum
a93979f95a
Add engines field in templateEngine
2016-01-29 13:55:50 +01:00
Michael Hackstein
0b583d756a
Duplicated static helper functions in AQLFunctions to be able to hadle VPack. Added a dummy for AqlValue->VPack. We have to clarify the data responsibilites before continuing here.
2016-01-29 13:42:15 +01:00
Andreas Streichardt
8928806a21
Fix lint
2016-01-29 13:02:42 +01:00
Andreas Streichardt
9850058d01
Merge branch 'devel' into waitforagency
2016-01-29 11:27:35 +01:00
Jan Steemann
a640e56f8a
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-01-29 11:10:58 +01:00
Jan Steemann
2112d7c1f8
added override and final specifiers
2016-01-29 11:10:46 +01:00
Jan Steemann
b82e9c692a
removed unnecessary block
2016-01-29 11:10:24 +01:00
Jana
e40d059510
Update README.md
2016-01-29 10:52:33 +01:00
Jan
0b8b5c34ad
Merge pull request #1690 from janavolkova9/patch-1
...
Update README.md
2016-01-29 10:32:49 +01:00
Jana
89db215369
Update README.md
2016-01-29 10:29:30 +01:00
Wilfried Goesgens
6c0d6cd182
Merge branch 'devel' of github.com:arangodb/ArangoDB into devel
2016-01-29 09:57:41 +01:00
Wilfried Goesgens
61c8941ac9
Remove unneccesary copy of va_args
2016-01-29 09:57:20 +01:00
Michael Hackstein
bdf4abaa27
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2016-01-29 09:40:25 +01:00
Michael Hackstein
8dc1d94107
Reverted change on scripts/run of 9c80e17716
. This allows to start the tests again. We still need a proper fix.
2016-01-29 09:40:17 +01:00
jsteemann
c3fc7e1aa7
don't lock in destructor
...
we have a global instance of the query cache and its destruction is
called during static deinitialization after main. if we use locks in
the dtor then we will use locks during static deinitialization (which
is fine in general, but prevents us from tracking the lock usage by
threads using thread-local storage)
2016-01-29 01:12:59 +01:00
jsteemann
04d459a5db
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-01-29 00:51:14 +01:00
jsteemann
43639aee79
removed hint about "normal mode" as there is only a normal mode nowadays
2016-01-29 00:50:51 +01:00