Max Neunhoeffer
05c9e4fd54
Cleanup resizing of MultiPointerHash
2014-03-28 09:14:20 +01:00
Esteban Lombeyda
a0f6c9d138
Compiler Fix
2014-03-27 17:10:34 +01:00
Max Neunhoeffer
b4e80d5a26
Merge branch 'devel' into associative_tests
2014-03-27 16:32:56 +01:00
Max Neunhoeffer
650d852db9
Graph tests work again.
2014-03-27 16:32:24 +01:00
Esteban Lombeyda
c502f37c1b
Non used variables were commented out (Compiler warning C4101)
2014-03-27 16:06:13 +01:00
Jan Steemann
d48a2507fc
fixed wrong return type
2014-03-27 09:45:25 +01:00
Max Neunhoeffer
100e689fe9
Remove unused code for associative multi arrays.
...
If we ever need this, it will be better to copy the code for
associative multi pointer arrays.
2014-03-27 00:15:27 +01:00
Max Neunhoeffer
d7f78c8add
Finish deletion of entries from associative-multi hash.
2014-03-27 00:10:09 +01:00
Max Neunhoeffer
7b4f7f665c
Lookup compiles, deletion planned.
2014-03-26 16:21:50 +01:00
Max Neunhoeffer
c32f717a07
Merge branch 'devel' into associative_tests
2014-03-26 15:12:54 +01:00
Max Neunhoeffer
185d86c04f
Snapshot before moving to indices in associative-multi.
2014-03-26 15:12:36 +01:00
Max Neunhoeffer
2336b9f310
Try variants of TRI_IncModU64 and add TRI_DecModU64.
2014-03-26 09:15:57 +01:00
Max Neunhoeffer
fd76cd6fad
Experiments on hashing.
2014-03-25 16:24:27 +01:00
Frank Celler
d34832bbcf
added changePassword attribute for users
2014-03-25 11:40:13 +01:00
Jan Steemann
f60eae74e4
fix compiler warning
2014-03-24 16:13:20 +01:00
Max Neunhoeffer
5c63512bb5
If we run out of prime numbers, do not change value.
2014-03-24 14:07:31 +01:00
Max Neunhoeffer
523029e190
Use only hash lengths that are prime numbers.
2014-03-24 14:07:00 +01:00
Max Neunhoeffer
dde446fb28
Optimise hash tables by no longer using % for wraparound.
2014-03-24 14:04:24 +01:00
Jan Steemann
2aef412cd4
use sizeHint for hash index, too
2014-03-21 22:59:41 +01:00
Jan Steemann
c760272a7f
provide a sint hint to indexes when initially filling them
...
this may speed up building indexes when opening an existing collection
2014-03-17 11:29:13 +01:00
Jan Steemann
d10258594e
issue #772 : added diagnostic output for Foxx application upload
...
Conflicts:
CHANGELOG
2014-03-14 10:50:38 +01:00
Jan Steemann
1cd29e0bb4
fixed typo in comment
2014-03-13 23:02:51 +01:00
Jan Steemann
ff2198151b
fixed vector insert at end
2014-03-12 14:27:51 +01:00
Max Neunhoeffer
5110b45c26
Change Windows version to pass SOCKET handles to libev.
...
One has to use the corresponding change in the ArangoDB-Windows
repository as well, where libev is patched for this purpose.
2014-03-10 15:38:03 +01:00
Max Neunhoeffer
ccb037a4d9
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-07 16:48:46 +01:00
Max Neunhoeffer
cd0a33de9f
Seemingly fix behaviour on Windows.
...
Note: WSACleanup complains and we do not know a fix.
2014-03-07 16:48:21 +01:00
Max Neunhoeffer
6206f91d56
Yet another fix for process shutdown on Unix.
2014-03-07 16:20:12 +01:00
Max Neunhoeffer
101486c6af
Improve error handling in process startup in js testing framework.
2014-03-07 15:01:50 +01:00
Jan Steemann
910996529c
windows
2014-03-07 11:45:55 +01:00
Jan Steemann
6b42df078b
sockets fix
2014-03-06 17:17:31 +01:00
Jan Steemann
79defc2ef1
-Wunreachable-code reverted. Visual Studio doesn't like it
2014-03-06 11:36:58 +01:00
Jan Steemann
c5c294aa6b
-Wunreachable-code
2014-03-06 11:30:38 +01:00
Jan Steemann
84364a7601
fixed socket shutdown on Windows
2014-03-06 10:34:29 +01:00
Jan Steemann
e9d2d555af
renamed parameter to silence compilers
2014-03-06 10:34:13 +01:00
Frank Celler
0684d0bda4
added vista locks
...
Conflicts:
GNUmakefile
lib/BasicsC/locks-win32.c
lib/BasicsC/locks-win32.h
2014-03-05 14:22:27 +01:00
Max Neunhoeffer
63bcda3c78
Fix a typo for Windows.
2014-03-04 13:13:10 +01:00
Max Neunhoeffer
dcb2feccd0
Another try to fix process startup under Windows.
2014-03-04 12:31:14 +01:00
Max Neunhoeffer
e652d663bf
Fix socket closing under Windows.
2014-03-04 11:23:11 +01:00
Jan Steemann
c18055b284
fixed compiler warning
2014-03-04 10:41:55 +01:00
Max Neunhoeffer
1cb38c6aca
Fix compilation under windows.
2014-03-04 08:53:16 +01:00
Jan Steemann
9cdd453043
fixed compiler warning
2014-03-03 19:25:42 +01:00
Max Neunhoeffer
e280ea9e91
First try to cleanup process startup for good.
...
Unix: compiles and works.
Windows: tried to cleanup, did not try to compile yet.
2014-03-03 17:02:16 +01:00
Jan Steemann
3478c8bc74
cppcheck
2014-03-03 09:12:34 +01:00
Frank Celler
f4dd63e55d
Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0
2014-03-02 13:41:59 +01:00
Frank Celler
58ca2f9647
added windows mem function
2014-03-01 17:28:06 +01:00
Frank Celler
d37a5221ab
added pyhsical memory for linux
2014-03-01 17:23:20 +01:00
Frank Celler
e70c9bed21
added total memory for mac
2014-03-01 17:16:10 +01:00
Frank Celler
b888e8cfa6
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
...
Conflicts:
arangod/V8Server/V8PeriodicJob.cpp
js/apps/system/aardvark/api-docs.json
js/apps/system/aardvark/api-docs/batch.json
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/cursor.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/document.json
js/apps/system/aardvark/api-docs/edge.json
js/apps/system/aardvark/api-docs/edges.json
js/apps/system/aardvark/api-docs/endpoint.json
js/apps/system/aardvark/api-docs/graph.json
js/apps/system/aardvark/api-docs/index.json
js/apps/system/aardvark/api-docs/job.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/simple.json
js/apps/system/aardvark/api-docs/system.json
js/apps/system/aardvark/api-docs/traversal.json
2014-02-28 20:37:05 +01:00
Max Neunhoeffer
a264b55f32
Fight zombies.
2014-02-28 20:24:42 +01:00
Max Neunhoeffer
7a767b25ac
waitpid for a child even if we do no longer know it.
2014-02-28 20:20:43 +01:00
Esteban Lombeyda
751046e6f1
using white spaces instead tabulators
2014-02-28 19:01:35 +01:00
Frank Celler
1aa3a02167
changed default log level to warning
2014-02-28 12:25:30 +01:00
Esteban Lombeyda
85e824f1c8
Bug Fix: compiler error
...
: searching strategy for installation directory upgraded
2014-02-28 12:07:29 +01:00
Frank Celler
e8a638f1b5
only support programm suffix
2014-02-27 21:38:34 +01:00
Frank Celler
56536adb96
set log level as soon as possible
2014-02-27 18:47:16 +01:00
Max Neunhoeffer
2315bc2c87
Cleanup TRI_GetAbsolute code.
2014-02-24 09:25:52 +01:00
Max Neunhoeffer
4e847c508c
Fix a comment.
2014-02-21 15:15:40 +01:00
Max Neunhoeffer
e7730b6a16
Kill process under Unix even when it is not known.
2014-02-20 10:17:16 +01:00
Max Neunhoeffer
a58e261f16
Repair windows executeExternal.
2014-02-19 15:46:16 +01:00
Max Neunhoeffer
074ef1cb31
Unify process startup between Windows and not.
2014-02-19 15:01:37 +01:00
Max Neunhoeffer
6b3cfa1256
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-19 11:13:16 +01:00
Max Neunhoeffer
c756f0bb04
Fix command line quoting for Windows.
2014-02-19 11:12:03 +01:00
Frank Celler
066abd777c
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
...
Conflicts:
js/apps/system/aardvark/frontend/js/routers/router.js
2014-02-19 10:21:00 +01:00
Frank Celler
da7d64bba9
removed wow6432 hack
2014-02-19 10:13:30 +01:00
Max Neunhoeffer
3a121b4082
First try to fix Windows command line arg quoting.
2014-02-19 09:58:20 +01:00
Max Neunhoeffer
c3c2cba69b
Build up command line arguments for windows process startup.
2014-02-18 15:34:29 +01:00
Max Neunhoeffer
bc99b765d0
Add wait argument to statusExternal.
...
Windows version untested.
2014-02-17 16:40:11 +01:00
Max Neunhoeffer
c2cb8c20cb
Fix casting bug.
2014-02-17 14:45:47 +01:00
Max Neunhoeffer
75eff02608
Please the compiler under Windows.
2014-02-17 14:27:46 +01:00
Max Neunhoeffer
dd3546ee40
Resolve socket bug under Windows.
2014-02-17 14:21:47 +01:00
Max Neunhoeffer
3d27a9f0ad
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
2014-02-14 14:44:45 +01:00
Max Neunhoeffer
076bc6e723
Cleanup socket abstraction for different OSes.
2014-02-14 14:44:27 +01:00
Frank Celler
6269c61aa7
Merge remote-tracking branch 'origin/devel' into sharding
2014-02-14 14:21:59 +01:00
Jan Steemann
f8476ce0b0
fixed tests
2014-02-13 18:14:53 +01:00
Esteban Lombeyda
6ccfa1aad2
starting and killing of windows process was implemented
2014-02-13 16:30:31 +01:00
Jan Steemann
bb0f591349
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-13 15:33:39 +01:00
Frank Celler
739900fc2f
try to force abort
2014-02-13 12:06:52 +01:00
Jan Steemann
4fc8cae57d
index creation with ids
2014-02-13 11:00:08 +01:00
Jan Steemann
c4d52ff133
getIndexes, dropIndex
2014-02-12 17:09:47 +01:00
Jan Steemann
399ddebbd3
ensureIndex 1st
2014-02-10 14:36:32 +01:00
Jan Steemann
b4d9f10f17
fixed some database methods
2014-02-06 15:54:34 +01:00
Jan Steemann
57365cdcb0
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-06 12:17:51 +01:00
Jan Steemann
b5550e17a6
updated tests and documentation
2014-02-06 12:11:17 +01:00
Max Neunhoeffer
91fc65ba8d
Change signal from SIGKILL to SIGTERM because it is more friendly.
2014-02-06 12:06:06 +01:00
Max Neunhoeffer
73b4222089
Fix a bug in StartExternalProcess.
2014-02-04 14:05:31 +01:00
Max Neunhoeffer
c2e6c16395
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
2014-01-31 19:34:55 +01:00
Max Neunhoeffer
b6c3600ecc
Add an include needed to please the compiler on Linux.
2014-01-31 19:31:36 +01:00
Max Neunhoeffer
73f3dbc328
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
2014-01-31 18:56:47 +01:00
Frank Celler
988bd0b891
added port test
2014-01-31 18:38:02 +01:00
Frank Celler
29f075cfce
added external processes
2014-01-31 15:55:51 +01:00
Jan Steemann
9643469631
do not allow changing shard key attributes
2014-01-31 13:19:03 +01:00
Jan Steemann
e9c5af7895
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
CHANGELOG
js/apps/system/aardvark/frontend/css/collectionsView.css
js/apps/system/aardvark/frontend/css/layout.css
js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Frank Celler
973f9aa2fb
added linenoise
2014-01-30 17:23:24 +01:00
Jan Steemann
e2a7e2dfb3
windows
2014-01-28 17:32:32 +01:00
Max Neunhoeffer
c3f01237b0
Implement replace and update on cluster.
...
This still has a freeing too early bug with TRI_json_t.
2014-01-28 16:49:44 +01:00
Max Neunhoeffer
7d5723756f
Implement DELETE REST method on the coordinator.
2014-01-24 21:31:58 +01:00
Max Neunhoeffer
f5c274e8c0
Fix error handling and another bug in create document for cluster.
2014-01-24 10:35:37 +01:00
Jan Steemann
8283b61c7b
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-23 16:42:55 +01:00
Jan Steemann
b1fccd1bb0
added tests for JSON hashing
2014-01-23 16:42:42 +01:00
Max Neunhoeffer
9230f5020c
First case of create document is working on cluster.
2014-01-23 16:16:06 +01:00
Max Neunhoeffer
165d98578a
First hack at create document via REST on cluster.
2014-01-23 13:00:44 +01:00
Max Neunhoeffer
2d44e85f6d
Add hashing of TRI_json_t to uint64_t.
2014-01-22 16:20:05 +01:00
Jan Steemann
80e8250d54
fixed segfault
2014-01-21 12:50:35 +01:00
Jan Steemann
64417d4423
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
arangod/V8Server/v8-vocbase.cpp
2014-01-21 09:29:45 +01:00
Jan Steemann
a2e11e606b
added graph-specific error code
2014-01-18 01:08:24 +01:00
Max Neunhoeffer
92e52c33f8
Add a note about a possible bug.
2014-01-17 09:06:35 +01:00
Jan Steemann
8ef247eae5
fixed compile warning
2014-01-16 15:05:08 +01:00
Jan Steemann
bfbf7de9d3
fixed compile warning
2014-01-16 15:04:42 +01:00
Jan Steemann
c9dabaca86
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
2014-01-16 15:02:44 +01:00
Max Neunhoeffer
5960c103bc
Create/drop Database/Collection compiles.
2014-01-16 15:01:36 +01:00
Frank Celler
f56ac27dc9
Merge remote-tracking branch 'origin/1.4' into devel
...
Conflicts:
CHANGELOG
CMakeLists.txt
GNUmakefile
Makefile.in
VERSION
arangod/V8Server/ApplicationV8.cpp
build.h
configure
configure.ac
js/actions/api-foxx.js
js/apps/system/aardvark/api-docs.json
js/apps/system/aardvark/api-docs/batch.json
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/cursor.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/document.json
js/apps/system/aardvark/api-docs/edge.json
js/apps/system/aardvark/api-docs/edges.json
js/apps/system/aardvark/api-docs/endpoint.json
js/apps/system/aardvark/api-docs/graph.json
js/apps/system/aardvark/api-docs/index.json
js/apps/system/aardvark/api-docs/job.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/simple.json
js/apps/system/aardvark/api-docs/system.json
js/apps/system/aardvark/api-docs/traversal.json
lib/BasicsC/locks-win32.c
2014-01-16 08:53:31 +01:00
Frank Celler
c890caf260
fixed typos in windows parts
2014-01-16 08:40:36 +01:00
Jan Steemann
69a6e6449e
fixed Doxygen errors
2014-01-15 18:06:07 +01:00
Frank Celler
c0bf43d641
added ARANGODB_CONFIG_PATH
2014-01-15 14:27:01 +01:00
Michael Hackstein
9f3479f5b6
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
utils/Makefile.files
2014-01-10 17:41:52 +01:00
Max Neunhoeffer
eb2afb2f04
Implement case distinction for create collection between cluster and not.
2014-01-03 16:17:34 +01:00
Frank Celler
84507cfc44
merged changes from 1.4 back to devel
2013-12-27 14:59:23 +01:00
Frank Celler
995a3b06da
work-around for program-suffix
2013-12-23 18:02:06 +01:00
Frank Celler
a3ecc7cd5b
fixed wrong type
2013-12-23 16:03:30 +01:00
Frank Celler
f5759fa1b6
Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4
2013-12-23 12:56:06 +01:00
Frank Celler
0a47caa535
fixed open mode for files
2013-12-23 12:12:13 +01:00
Frank Celler
36f29a573c
fixed TRI_Basename
2013-12-22 23:57:42 +01:00
Frank Celler
2f28530bcc
wrong prototype, wrong destroy
2013-12-22 15:41:15 +01:00
Frank Celler
9ac2e751c6
fixed wrong ifdefs and missing constructor for Logger
2013-12-22 14:58:51 +01:00
Frank Celler
e30725e22d
more file path normalisation
2013-12-22 13:27:33 +01:00
Frank Celler
9b49d60b0a
fixed concatenate files
2013-12-22 12:45:54 +01:00
Frank Celler
87cc2c4104
Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4
2013-12-21 13:10:15 +01:00
Frank Celler
12fcc9a025
added TRI_LocateInstallDirectory
2013-12-21 13:09:44 +01:00
Frank Celler
1ef596733d
arangosh now uses config file name corresponding to binary name
2013-12-20 23:49:16 +01:00
Frank Celler
2651f7bae5
added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory
2013-12-20 10:39:50 +01:00
Frank Celler
b2d60817dd
added NL and CH
2013-12-19 17:18:29 +01:00
Frank Celler
a82ef8b1ea
fixed lock files for Windows
2013-12-19 11:26:38 +01:00
Jan Steemann
13bcc2bf7a
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
2013-12-11 18:39:10 +01:00
Jan Steemann
9e21cf9b7e
added configure option --enable-cluster
2013-12-10 14:46:16 +01:00
Frank Celler
86b7fea992
Vs2013
2013-12-07 18:55:55 +01:00
Frank Celler
f6b40b3395
added memchr and timezone for windows
2013-12-07 18:55:51 +01:00
Jan Steemann
2965accb05
add current state to agency
2013-12-06 14:23:02 +01:00
Jan Steemann
d3acf530da
re-added stuff that got lost yesterday
2013-12-05 10:26:21 +01:00
Jan Steemann
1306e0e651
committed generated file
2013-12-04 23:10:22 +01:00
Jan Steemann
44b3237882
moved server-only tests to js/server/tests
...
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work
make logfile path accessible
2013-12-04 22:05:00 +01:00
Jan Steemann
52f514b163
fixed doxygen error
2013-12-02 13:16:06 +01:00
Frank Celler
533a33d344
va_copy and inline are defined in 2013
2013-11-25 18:30:03 +01:00
Max Neunhoeffer
317304542a
Remove index garbage collector.
2013-11-25 10:57:23 +01:00
Jan Steemann
9a1aa7a4cc
removed superfluous error codes
2013-11-22 13:49:05 +01:00
Jan Steemann
0eeac02a91
removed unused error codes
2013-11-22 13:23:23 +01:00
Jan Steemann
ff648799fe
Fix a forgotten malloc and replace it with TRI_Allocate.
2013-11-22 12:28:07 +01:00
Max Neunhoeffer
3aa1b12a45
Merge branch 'skiplist-cleanup' into devel
...
This implements a considerable cleanup of the skip list index code:
- Replace implementation of skip lists by a generic one using
callbacks for comparisons
- The new implementation resides in lib/BasicsC/skip-list.*
- It uses a singly linked list (unidirectional) as opposed to the
previous implementation which used a doubly linked list
- Adjust skip list index code in arangod/SkipLists/skiplistIndex.* to
use the generic skip list implementation
- Unify unique skip lists and non-unique ones into one code base
- Cleanup in skip list index code, in particular with respect to
iterators
- Prepare the scene for sparse skip list indices
2013-11-22 10:47:04 +01:00
Jan Steemann
999fbaee23
added newline to log message
2013-11-21 16:42:16 +01:00
Jan Steemann
610f9a3cd7
added newline to log message
2013-11-21 16:16:09 +01:00
Jan Steemann
cbd2bbf2b1
fixed some multi-thread issues
2013-11-21 15:14:46 +01:00
Jan Steemann
1bdf666da2
fixed multi-threading issues found during commando
2013-11-21 15:12:49 +01:00
Jan Steemann
cf219d92d3
added debugSegfault
2013-11-20 13:15:45 +01:00
Max Neunhoeffer
822f9d37bd
Rename method name to TRI_SkipListGetNrUsed.
2013-11-20 11:09:28 +01:00
Max Neunhoeffer
1c56e87222
Export entry count for generic skip lists.
2013-11-20 11:07:31 +01:00
Frank Celler
f35347098b
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-11-20 09:20:51 +01:00
Frank Celler
7738a5b35d
cosmetics
2013-11-20 09:20:26 +01:00
Jan Steemann
4e1028d791
fixed doxygen error
2013-11-20 01:50:53 +01:00
Jan Steemann
95c341e910
issue #662 : ArangoDB on Windows hanging
2013-11-19 16:35:14 +01:00
Jan Steemann
af6da9a652
issue #662 : ArangoDB on Windows hanging
2013-11-19 16:27:26 +01:00
Max Neunhoeffer
971ab55cdd
Add keys to the generic skip list implementation.
2013-11-19 15:02:20 +01:00
Max Neunhoeffer
95e6ebc3ac
Add a cmpdata entry for comparisons.
2013-11-19 11:54:45 +01:00
Frank Celler
9f8f4cd4fd
destroy can only be called if initialised
2013-11-18 18:40:13 +01:00
Frank Celler
b58347138f
destroy can only be called if initialised
2013-11-18 18:39:18 +01:00
Max Neunhoeffer
c8b8af36b2
Follow coding style guidelines a bit more. Add nrUsed count.
2013-11-18 16:46:56 +01:00
Max Neunhoeffer
8955b0fda0
Fix compilation of new skip-list.c
2013-11-18 15:09:24 +01:00
Max Neunhoeffer
3464f31bf1
Add generic skip list functionality.
2013-11-18 14:55:52 +01:00
Max Neunhoeffer
e9b583e6c2
Remove old and unused skip-list.* from lib.
2013-11-18 13:59:33 +01:00
Jan Steemann
c5e9538547
Merge remote-tracking branch 'origin/devel' into inline-shapes
...
Conflicts:
arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Jan Steemann
d6c0fb36a6
windows condition variables
2013-11-13 21:01:53 +01:00
Jan Steemann
6d14b841b5
windows condition variables
2013-11-13 20:59:44 +01:00
Jan Steemann
06f6670288
simplified condition variables
2013-11-13 19:03:16 +01:00
Jan Steemann
ccb4f19db2
simplified condition variables
2013-11-13 19:02:22 +01:00
Jan Steemann
8f33346b65
fixed Windows file handling
2013-11-11 20:31:19 +01:00
Jan Steemann
042b805ce4
fixed Windows file handling
2013-11-11 20:30:23 +01:00
Jan Steemann
3bc6b42003
fixed comment
2013-11-11 20:06:41 +01:00
Jan Steemann
fabf66d77c
changed return codes
2013-11-06 11:24:13 +01:00
Jan Steemann
978c12815a
share basic shape types
2013-11-05 20:21:48 +01:00
Jan Steemann
b720b49a8c
issue #642 : renamed macro from TRI_WARN_UNUSED to TRI_WARN_UNUSED_RESULT
2013-10-30 12:19:26 +01:00
Jan Steemann
2a9205527f
simplify logging
2013-10-30 01:07:02 +01:00
Jan Steemann
4f50b98c45
removed second logger implementation
2013-10-30 00:38:25 +01:00
Jan Steemann
c751cc80fc
issue #642
2013-10-29 21:15:46 +01:00
Frank Celler
ebca4c601e
Merge remote-tracking branch 'origin/devel' into 1.4
2013-10-29 11:18:27 +01:00
Jan Steemann
723785b5b6
Windows warnings
2013-10-29 10:09:12 +01:00
Jan Steemann
071aa64e15
fixed syntax error on Win
2013-10-29 09:56:24 +01:00
Jan Steemann
057fd91646
lol self
2013-10-29 09:39:36 +01:00
Jan Steemann
0131735f30
issue #621 : always print fatal error at the end
2013-10-29 03:01:33 +01:00
Frank Celler
d33bcdc623
rc1
2013-10-28 17:54:24 +01:00
Jan Steemann
74926b1c7b
issue #621 : Standard Config needs to be fixed
2013-10-28 15:07:08 +01:00
Jan Steemann
72a2a487d3
some fixes for issue #642
2013-10-28 14:34:37 +01:00
Frank Celler
b6b381c663
moved TRI_ENABLE_MRUBY to command line
2013-10-20 18:46:31 +02:00
Jan Steemann
f498f8f03c
faster server shutdown
2013-10-18 10:18:46 +02:00
Jan Steemann
0a6148f2d6
fixed some VS complaints
2013-10-16 17:27:35 +02:00
Frank Celler
be162a1e35
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
...
Conflicts:
CHANGELOG
Documentation/Manual/NewFeatures14.md
Documentation/Manual/NewFeatures14TOC.md
Documentation/Manual/Upgrading14.md
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/cursor.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/document.json
js/apps/system/aardvark/api-docs/edge.json
js/apps/system/aardvark/api-docs/edges.json
js/apps/system/aardvark/api-docs/endpoint.json
js/apps/system/aardvark/api-docs/graph.json
js/apps/system/aardvark/api-docs/index.json
js/apps/system/aardvark/api-docs/job.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/simple.json
js/apps/system/aardvark/api-docs/system.json
js/apps/system/aardvark/api-docs/traversal.json
2013-10-14 14:00:29 +02:00
Jan Steemann
b8318609e2
updated arangorestore
2013-10-10 16:58:21 +02:00
Jan Steemann
af07091d1c
Windows fixes
2013-10-09 15:33:38 +02:00
Jan Steemann
e3df92d929
fix Windows file handling
2013-10-09 14:07:21 +02:00
Jan Steemann
cc14fb039a
fix some VS warnings
2013-10-09 14:05:36 +02:00
Jan Steemann
d6149c9a9a
added documentation for /_api/import
2013-10-02 14:22:25 +02:00
Frank Celler
ad2d4b9d76
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
...
Conflicts:
VS2012/Arangod Binary/Arangod Binary.vcxproj
VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj
VS2012/Arangosh Binary/Arangosh Binary.vcxproj
arangod/Ahuacatl/ahuacatl-grammar.c
js/actions/api-database.js
js/apps/aardvark/api-docs/edges.json
js/apps/aardvark/api-docs/traversal.json
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/cursor.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/document.json
js/apps/system/aardvark/api-docs/edge.json
js/apps/system/aardvark/api-docs/graph.json
js/apps/system/aardvark/api-docs/index.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/simple.json
js/apps/system/aardvark/api-docs/system.json
2013-09-30 14:39:59 +02:00
Jan Steemann
50efbd1243
optimisation for empty arrays
2013-09-26 12:58:19 +02:00