Jan Steemann
56966f7081
fix warning
2015-08-19 13:07:04 +02:00
Jan Steemann
f4112fd4d1
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-19 13:04:08 +02:00
Willi Goesgens
f51f8dde0b
by CoDEmanX: fix file permissions before installing
2015-08-19 13:02:13 +02:00
Jan Steemann
6268a20124
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-19 12:56:51 +02:00
Jan Steemann
3d73af7acf
added UPSERT
2015-08-19 12:56:41 +02:00
Jan Steemann
e01e874073
don't use void*
2015-08-19 12:56:32 +02:00
Michael Hackstein
241905c42c
Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing
2015-08-19 12:51:53 +02:00
Jan Steemann
63f9782fc3
removed unused arango_fe
2015-08-19 12:51:38 +02:00
Jan Steemann
d8be947246
fixed unittests-shell-client, which did not start anymore
2015-08-19 12:46:15 +02:00
Jan Steemann
65424143c6
fix VS build
2015-08-19 12:37:34 +02:00
Jan Steemann
28ad41defc
fix compile warnings
2015-08-19 12:22:34 +02:00
Jan Steemann
e9a598c020
do not include deprecated header
2015-08-19 12:01:12 +02:00
Michael Hackstein
1a4d59d954
Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing
2015-08-19 11:57:12 +02:00
Jan Steemann
6680f3bb5a
fix Mac build
2015-08-19 11:56:41 +02:00
Michael Hackstein
59e8ea3fad
Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing
2015-08-19 11:56:34 +02:00
Jan Steemann
6076bc632e
fixed Makefile
2015-08-19 11:37:51 +02:00
Jan Steemann
cb434ea863
added derived file
2015-08-19 11:20:23 +02:00
Jan Steemann
2c640965b8
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-19 11:19:46 +02:00
Jan Steemann
9f0384284f
moved files
2015-08-19 11:19:37 +02:00
Willi Goesgens
9143181f18
Merge pull request #1443 from aurelijusb/cmakeIgnore
...
Git ignore for CMAKE generated files
2015-08-19 10:25:54 +02:00
Willi Goesgens
01a1273a87
Merge pull request #1444 from aurelijusb/documentation
...
Small documentation improvements
2015-08-19 10:23:36 +02:00
Michael Hackstein
5c0ec7d318
Indexed my first array and was able to get it out again \o/. Unique constraint is not yet working though
2015-08-19 09:55:46 +02:00
Jan Steemann
bc7e0f7bbd
issue #1445 : Object literal simplificatin does not support pseudo-variables NEW and OLD
2015-08-19 09:25:46 +02:00
Jan Steemann
c8e7f1a784
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-18 18:10:40 +02:00
Jan Steemann
edd1e90511
clean up shell implementation code
2015-08-18 18:10:27 +02:00
Jan Steemann
8677da48b1
replication API enhancements, not yet ready
2015-08-18 18:08:20 +02:00
Willi Goesgens
8992b99ec5
add possibility to skip benchmark tests
2015-08-18 17:02:28 +02:00
Michael Hackstein
527120a3ea
Removed outdated documentation, has been replased by a newer version earlier
2015-08-18 16:36:13 +02:00
Michael Hackstein
3f90914397
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-08-18 16:15:42 +02:00
Michael Hackstein
602c3d0d59
Improved the documentation for Foxx controller
2015-08-18 16:14:39 +02:00
Willi Goesgens
487228ae83
Unix domainsocket startup: use arangosh to check whether the server is up and running.
2015-08-18 15:41:27 +02:00
Jan Steemann
7a366c605d
small refactoring
2015-08-18 14:24:19 +02:00
Jan Steemann
05c9005fcc
small refactoring for replication applier functions
2015-08-18 14:13:26 +02:00
Alan Plum
80b92488f8
Don't warn about Foxx app versions at all.
2015-08-18 13:42:47 +02:00
Jan Steemann
3c14a44c1b
simpler parsing of replication input
2015-08-18 13:33:51 +02:00
Michael Hackstein
580066fe8a
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-08-18 13:12:49 +02:00
Michael Hackstein
b81ac9be43
Foxx: controller.allRoutes can now use functions defined by extending the controller.
2015-08-18 13:12:40 +02:00
Jan Steemann
913d1b964f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-18 12:09:38 +02:00
Jan Steemann
76e85ffc1f
added test case
2015-08-18 12:09:30 +02:00
Michael Hackstein
481a106a7d
Implemented a helper function to extract all values in an array to be inserted
2015-08-18 11:37:09 +02:00
Willi Goesgens
4195b37513
Cleanup windows build
...
- enforce the usage of the proper python via manipulating the path environment
- create the complete directory
- add blanks to make the parameters better readable
2015-08-18 11:23:08 +02:00
Michael Hackstein
2bcef2e03b
Added a function that recursivly allocates and fills index_elements if one or more paths have to be expanded.
2015-08-18 09:09:36 +02:00
Jan Steemann
338dd7e100
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-17 18:41:13 +02:00
Jan Steemann
4e771b2728
replication improvements
2015-08-17 18:41:05 +02:00
Willi Goesgens
35de50d153
set the mac to add hashes too.
2015-08-17 17:31:15 +02:00
Willi Goesgens
5c9b5b5631
Merge branch 'devel' of github.com:arangodb/ArangoDB into devel
2015-08-17 17:30:49 +02:00
Willi Goesgens
593eed4ac1
Adjust the import site of the dumper for hashes in the filenames.
2015-08-17 17:08:06 +02:00
Jan Steemann
ffe4fb556b
pacify VS
2015-08-17 17:05:52 +02:00
Michael Hackstein
b0df08822f
Removed obsolete function for HashIndex insertion
2015-08-17 16:10:43 +02:00
Michael Hackstein
33c3c0474e
Removed obsolte header file in old hashindex
2015-08-17 16:04:18 +02:00