Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,556 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

18556 Commits

Author SHA1 Message Date
Jan Steemann 2ab3aa998d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-17 14:21:37 +01:00
Jan Steemann db1ddb880b wait for sync thread outside of lock 2014-12-17 14:21:24 +01:00
Jan Steemann 363df745ea fix program names 2014-12-17 14:19:54 +01:00
Willi Goesgens d46b215e30 Expect Indexrangenodes where we now know they will be created. 2014-12-17 14:01:50 +01:00
Willi Goesgens fb3ec155a8 Re-Instanciate the context-scope guard were needed. 2014-12-17 13:59:56 +01:00
Willi Goesgens 016c8e477b Remove debug prints 2014-12-17 13:32:34 +01:00
Willi Goesgens ed2529efe9 We can now convert EnumerateCollectionNodes to IndexRangeNodes here too. 2014-12-17 13:05:44 +01:00
Jan Steemann be1a41991d updated CHANGELOG 2014-12-17 11:01:18 +01:00
Willi Goesgens b4ad28dff4 Split Travis build into several steps, so we can fold them in the Travis UI. 2014-12-17 10:45:25 +01:00
Lucas Dohmen 58e52e6a0c Merge pull request #1193 from stackmagic/foxx-repo-doc 
mention 'byId' supports not only ids but also keys (from #1181)
 2014-12-17 10:35:20 +01:00
Jan Steemann cc3b97491d added derived files 2014-12-17 10:30:32 +01:00
Jan Steemann 37a39892ec issue #1185: parse non-fractional numbers with exponent 2014-12-17 10:30:18 +01:00
Jan Steemann e8f51f1b5f issue #1185: parse non-fractional numbers with exponent 2014-12-17 10:28:48 +01:00
Frank Celler ab99e17876 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-17 09:32:02 +01:00
Frank Celler 9e3474d335 raised version 2014-12-17 09:31:55 +01:00
Willi Goesgens 419e3ece51 Make jslint happy. 2014-12-17 09:22:22 +01:00
Jan Steemann 9c6b3d2897 test for std::unordered_map::emplace() 2014-12-16 23:18:07 +01:00
Jan Steemann c5f82f1b10 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-16 22:52:55 +01:00
Jan Steemann dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Willi Goesgens 14baf7b3d6 fix typo. 2014-12-16 19:37:56 +01:00
Willi Goesgens aa5ba7db20 Fix typo in makefile. 2014-12-16 19:21:05 +01:00
Willi Goesgens 6850409229 Properly include the -lrt into our automake scheme. 2014-12-16 19:13:18 +01:00
Willi Goesgens 4e96da7b9e Remove debug output - works now. 2014-12-16 18:56:18 +01:00
Willi Goesgens ec4d6a33f4 Add more complex macro checking for -lrt 2014-12-16 18:47:57 +01:00
Frank Celler 8f8415bd8b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 18:47:52 +01:00
Frank Celler 0c394bec44 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 18:37:06 +01:00
Frank Celler 385d143d9c use GYPFLAGS="-Dstandalone_static_library=1" 2014-12-16 18:37:02 +01:00
Willi Goesgens bd2485ff0d Check whether libc provides rt for later linking of V8; if not we need to add -lrt to our LDFLAGS. 
See man clock_gettime for details.
 2014-12-16 18:35:55 +01:00
Frank Celler 5721f8aad5 added CC as well (just to be sure) 2014-12-16 18:02:48 +01:00
Jan Steemann b84d513b6b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-16 17:30:56 +01:00
Jan Steemann 50e08ab099 removed unused file 2014-12-16 17:30:48 +01:00
Michael Hackstein e24ad86ba0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/applicationsView.js
 2014-12-16 17:06:49 +01:00
Willi Goesgens b94c80c8ef Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 17:03:57 +01:00
Michael Hackstein d9156bc921 Changed hardcoded error num in web interface to generated error object 2014-12-16 17:03:55 +01:00
Willi Goesgens 9cbfb91f8c Offer possibility to have a pre-compiled non-system V8 so jenkins can save cpu cycles. 2014-12-16 17:03:17 +01:00
Jan Steemann 8515b8643e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2014-12-16 16:53:51 +01:00
Jan Steemann b62a52e6cf updated CHANGELOG 2014-12-16 16:53:21 +01:00
Jan Steemann 591d975672 remove unused library 2014-12-16 16:53:04 +01:00
Frank Celler 3867a0ddd1 new version 2014-12-16 16:51:20 +01:00
Frank Celler 051626d4e4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 16:50:12 +01:00
Frank Celler 5ebcfc1d5e added gcc-4.9 2014-12-16 16:49:34 +01:00
Frank Celler 95b03268b6 Update LICENSES-OTHER-COMPONENTS.md 2014-12-16 16:39:58 +01:00
Frank Celler e2ab3685c4 renamed to md 2014-12-16 16:39:12 +01:00
Frank Celler e6ebc24cb0 added more components 2014-12-16 16:37:18 +01:00
Frank Celler 40e4b40dff Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 16:28:30 +01:00
Jan Steemann 61f799ecf0 satisfy jslint 2014-12-16 15:37:15 +01:00
Jan Steemann a8ad216a0a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-16 15:25:53 +01:00
Jan Steemann 571b6b5b02 added tests 2014-12-16 15:25:46 +01:00
Willi Goesgens 7c9ece25ce bash -c is the right option to run commands. 2014-12-16 14:30:41 +01:00
Willi Goesgens a7ff43081c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 14:22:56 +01:00