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

12066 Commits

Author SHA1 Message Date
jsteemann 51ca41df62 fix startup with completely empty VERSION file 2016-07-05 10:32:10 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Jan Steemann 9c98cb6cf3 added test for skipLines 2016-07-04 12:15:13 +02:00
Frank Celler 325ede0676 lowered timeout 2016-07-02 15:47:45 +02:00
hkernbach 0c2e61b794 gv2 [ci skip] 2016-07-01 11:04:03 +02:00
hkernbach 1c70dcee42 merge 2016-07-01 11:02:00 +02:00
hkernbach 18907a2afa gv2 prep 2016-07-01 10:36:51 +02:00
Andreas Streichardt 6ee1f6d14a Reformat code 2016-06-30 16:57:17 +02:00
Jan Steemann 6c2f9148cc increase max. number of collections to 256 2016-06-30 13:44:31 +02:00
Andreas Streichardt 72fbc21031 Fix semistandard problems 2016-06-29 19:59:37 +02:00
Andreas Streichardt 10b4b7bcf0 testbed for reformatting 2016-06-29 19:47:18 +02:00
Andreas Streichardt 8a286a30d9 We are now using semistandard and eslint 2016-06-29 18:27:02 +02:00
jsteemann 80f774cef3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-29 17:40:52 +02:00
jsteemann 7339ff2c2c jslint 2016-06-29 17:40:46 +02:00
Alan Plum 999ca00165 Merge pull request #1903 from baslr/patch-4 
custom toJSON for FoxxContext
 2016-06-29 16:34:54 +02:00
Kaveh Vahedipour e922909d6d empty arrays handled wrong 2016-06-29 15:39:51 +02:00
Kaveh Vahedipour 4c8ae6e5c5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-29 14:59:16 +02:00
Kaveh Vahedipour 1baf2050c6 waitForCommited bug in agency fixed 2016-06-29 14:54:05 +02:00
Max Neunhoeffer 3ee7ff4aa9 Fix for synchronisation of shards logic. 2016-06-29 11:59:26 +02:00
jsteemann cd49ac415c added test 2016-06-28 13:33:40 +02:00
Mark cd932c4060 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-28 12:49:26 +02:00
Mark fb6f61ba30 shortestpath tests added 2016-06-28 12:49:05 +02:00
jsteemann 54bfd255dc added test for "collection is a nullptr" issue 2016-06-28 12:16:36 +02:00
Michael Hackstein c3084dfd0a Fixes #1831. Thank you very much for spotting this. The alias of insert was not propagated properly through the general-graph module. 2016-06-28 09:50:20 +02:00
Manuel B 1eb49ee6a1 custom toJSON for FoxxContext 
this fixes #1898
returns only documented values and hides internal values.
 2016-06-27 23:46:59 +02:00
Michael Hackstein 65c82ee38e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-27 16:57:54 +02:00
Michael Hackstein 808cb97707 Fixed a bug in SHORTEST_PATH using a distance attribute. In some cases the computed path was not correct. 2016-06-27 16:57:47 +02:00
Wilfried Goesgens 30b7244196 Give a little bit more time to wait for collections being dropped, when doing coverage. 2016-06-27 10:36:24 +02:00
hkernbach bedab04286 graph ui devel 2016-06-24 23:21:39 +02:00
Kaveh Vahedipour 6d1d1e6b0b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 15:37:08 +02:00
Kaveh Vahedipour bbade806c3 more agency tests 2016-06-24 15:36:57 +02:00
jsteemann 274801b7b6 issue #1891: renamed to OUTERSECTION 2016-06-24 14:07:41 +02:00
jsteemann daf6d42683 optimize away some more filter parts of type `"const" IN collection.attribute 2016-06-24 14:03:58 +02:00
jsteemann e0710c6fa3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 10:53:12 +02:00
hkernbach c490726121 ui foxx app store install fix 2016-06-24 10:51:42 +02:00
jsteemann 50c3aa93a9 issue #1891: added AQL function `DIFFERENCE` to return the symmetric difference of its input arguments 2016-06-24 10:35:49 +02:00
Wilfried Goesgens 09e4475096 disable numeric aql tests for solaris - its broken in the solaris libm. 2016-06-23 18:05:28 +02:00
Kaveh Vahedipour 761b16e407 added 'in'-check for agency precondition 2016-06-23 17:17:03 +02:00
Kaveh Vahedipour 015297c0ab minimal verbose output from agency test 2016-06-23 14:04:03 +02:00
jsteemann 7496fa2c67 issue #1894: make list of edge collections unique in traversal 2016-06-23 12:17:04 +02:00
hkernbach f9d737ebd9 query view notification bugfix 2016-06-23 11:21:30 +02:00
Kaveh Vahedipour 57d231fd42 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-23 10:48:37 +02:00
Kaveh Vahedipour b40e5a3d24 agency test waits exactly for the leader election to have ended 2016-06-23 10:48:26 +02:00
Frank Celler d8318148ca authorization is optional 2016-06-23 10:46:43 +02:00
hkernbach 30d73c2dcf removed console logs 2016-06-22 21:56:31 +02:00
hkernbach 89a47ee0a3 ui event bugfixes 2016-06-22 21:15:22 +02:00
Simran Brucherseifer edd22df7fc Aardvark: Fix label reference to actual ID 2016-06-22 12:50:42 +02:00
Wilfried Goesgens 0f18606c74 permit download of swagger json if authentication is turned of. 
This fixes #1888
 2016-06-22 10:27:35 +02:00
hkernbach 4714f539cd select2 ui 2016-06-22 01:20:10 +02:00
hkernbach 74fa793609 grunt build [ci skip] 2016-06-22 00:59:22 +02:00
hkernbach 95e9062c49 modified shards ui 2016-06-22 00:54:30 +02:00
Simran Brucherseifer 32a6dfea8a Hide native dropdown arrow in Firefox 2016-06-21 17:46:13 +02:00
hkernbach 67b3b94dbd small json ui improvement 2016-06-21 15:13:09 +02:00
hkernbach 2969c886fe ui fixed swagger json output 2016-06-21 15:08:43 +02:00
Alan Plum 5231ff4dd3
Rebuild aardvark 2016-06-21 11:34:47 +02:00
Alan Plum 82f9b024f8
Make download nonce-based 2016-06-21 11:34:37 +02:00
Alan Plum 77c96537d1
Fix failing test 2016-06-21 10:49:50 +02:00
Alan Plum 24074069f9
Finalize Router/Response.md 2016-06-21 00:13:01 +02:00
Alan Plum e77e18bbc9
Fix swagger a litle bit 2016-06-20 21:41:14 +02:00
Alan Plum ab296ac829
Check trustedProxies lazily 2016-06-20 18:57:42 +02:00
Alan Plum a0b67ae7ad
Handle false-y TRUSTED_PROXIES as null 2016-06-20 18:03:48 +02:00
Alan Plum 132a3fa387
Finalize Context.md 2016-06-20 18:02:26 +02:00
Alan Plum 50b8873d7c
More docs 2016-06-20 17:37:45 +02:00
hkernbach 116513d98d login view bugfix 2016-06-20 14:48:01 +02:00
Max Neunhoeffer 11adb777ca Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-20 00:42:00 -07:00
Max Neunhoeffer 11e3de54a1 Repair reverse proxy absolute path rewriting business. 2016-06-20 00:40:45 -07:00
Alan Plum da9035a464
Document crypto module, clean up modules appendix 2016-06-19 21:56:11 +02:00
Alan Plum c55f6df799
Finalize Router/Endpoints.md 2016-06-19 19:54:04 +02:00
hkernbach 487dbb9558 grunt build 2016-06-19 19:21:56 +02:00
hkernbach 433c636c51 fixed user permission bug in ui 2016-06-19 19:17:00 +02:00
hkernbach 1b8fe39348 fixed a web ui users bug 2016-06-19 17:45:37 +02:00
Max Neunhoeffer 50f325b4cf Fix typos. 2016-06-18 00:02:02 -07:00
Max Neunhoeffer 67bd33152b Fix typo. 2016-06-17 23:58:58 -07:00
Max Neunhoeffer aae9e92dc0 Change logic when a sync shard job is scheduled. 2016-06-17 23:57:15 -07:00
Max Neunhoeffer 7563cf56d0 Fix sync repl fix. 2016-06-17 23:18:28 -07:00
Max Neunhoeffer fe0cb0a958 Another fix for shard synchronisation. 2016-06-17 23:16:21 -07:00
Max Neunhoeffer 3bb4424b18 Wait for sync rep before dropping and recreating collection. 2016-06-17 14:18:48 -07:00
Frank Celler 11c87d247e generated 2016-06-17 21:16:42 +02:00
Max Neunhoeffer 1cf3e23575 Automatically generated error files for JS. 2016-06-17 11:56:44 -07:00
Max Neunhoeffer 01b3211048 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-17 11:02:56 -07:00
Alan Plum 8a640eb1b5
ERROR_APPLICATION_* -> ERROR_SERVICE_* 2016-06-17 20:02:25 +02:00
Max Neunhoeffer f59668e889 When recreating a collection to avoid system collections, wait for sync rep. 2016-06-17 11:02:24 -07:00
Max Neunhoeffer 3db19df169 Fix bug in syncCollectionFinalize. 2016-06-17 09:50:18 -07:00
hkernbach 8d5e38fc03 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-17 16:59:13 +02:00
hkernbach a5345fc3fc cleanup 2016-06-17 16:59:05 +02:00
hkernbach 29308720d1 frontend docu 2016-06-17 16:47:47 +02:00
Alan Plum a56aae69d4
Export foxx/mocha.findTests 2016-06-17 16:17:16 +02:00
Wilfried Goesgens 79e01ccf0e Fresh examples. 2016-06-17 15:31:32 +02:00
Alan Plum c4ed4d9df0
Make swagger docs secure again 2016-06-17 14:52:15 +02:00
Alan Plum ba2c489134
Stop swagger-ui from complaining about api key 
[skip ci]
 2016-06-17 14:51:38 +02:00
Alan Plum fd7a7c154b
More readable manifest messages 
[skip ci]
 2016-06-17 14:11:04 +02:00
hkernbach b8b9b2387c scss fix [ci skip] 2016-06-17 13:47:53 +02:00
Alan Plum 298c74d1cc
Override left offset in %dropdown-menu 
[skip ci]
 2016-06-17 13:41:58 +02:00
hkernbach 57e9f6349a ui - added state for percentage values [ci skip] 2016-06-17 13:17:22 +02:00
hkernbach d23579f507 ui fix [ci skip] 2016-06-17 12:36:20 +02:00
hkernbach 34805003fe fixed chaning collection properties in cluster 2016-06-17 11:55:08 +02:00
Frank Celler 7bcc7b33f3 removed debug log messages 2016-06-17 11:42:22 +02:00
hkernbach 70ad0867d4 shardDistribution api, shards view 2016-06-17 11:10:11 +02:00
hkernbach 101e352902 better output if no shards available 2016-06-17 10:25:31 +02:00
hkernbach 50573ff75c router fix 2016-06-17 09:57:19 +02:00
hkernbach 02fb2c2939 better handling of api documentation box size 2016-06-17 09:26:44 +02:00
hkernbach 3ab49b687d offline check recognizes 401 unauthorized [ci skip] 2016-06-17 09:10:51 +02:00
Max Neunhoeffer 6011ee4994 Repair a test by making SORT well-defined. 
There was actually a difference in a (non-guaranteed) sort order
between single server and cluster. This is fixed now.
 2016-06-16 12:02:54 -07:00
Alan Plum 5721effec7
Add missing license comment 
[skip ci]
 2016-06-16 19:53:01 +02:00
Alan Plum b289f666db
More detailed error messages in Foxx API 2016-06-16 19:52:27 +02:00
Wilfried Goesgens f7731562c3 As @afj88 points out, one can't drop a database that one is currently in. 2016-06-16 15:56:37 +02:00
Mark 0e00597e4b fixed compatibility graph functions, added tests 2016-06-16 15:39:05 +02:00
Alan Plum f593734233
Fix mounting with pathParams 2016-06-16 14:04:12 +02:00
Alan Plum 6c12b1b62d
Too eager 2016-06-16 13:51:15 +02:00
Alan Plum 16b3b59272
Fix aardvark scripts route 2016-06-16 13:48:15 +02:00
Alan Plum a70d0d75cd
Fix routing order: defaultDocument->router->files 2016-06-16 12:59:08 +02:00
Alan Plum c9be12eb37
If a param is declared make sure it is recognized 2016-06-16 12:08:57 +02:00
Alan Plum 48d1048f2d
Fix validateParam with auto path params 2016-06-16 11:54:24 +02:00
Alan Plum e880cd6ec3
trustProxy should be null by default 
If neither ArangoDB itself nor the Foxx service specify whether proxies should be trusted, the default should not be true.
 2016-06-16 11:08:37 +02:00
Alan Plum 6ef6d9fa1a
Use an actual example IP in test-utils 2016-06-16 11:08:37 +02:00
hkernbach 6a2d681fd3 fixed wrong gharial api route 2016-06-16 10:49:50 +02:00
hkernbach b6f3d506d9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-16 09:56:59 +02:00
hkernbach f88c9cbfe6 css nodes fix [ci skip] 2016-06-16 09:56:49 +02:00
Mark faf599f41d erge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-16 08:21:55 +01:00
Mark 925f96d5c2 Graph: fixed weight/weightAttribute name 2016-06-16 09:21:25 +02:00
hkernbach f0ae86baca ie ajax fix 2016-06-16 08:57:56 +02:00
Max Neunhoeffer d0fe9f6d81 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-15 21:29:20 -07:00
Max Neunhoeffer fb19602436 Finally give system collections replication factor 2. 2016-06-15 21:28:36 -07:00
Max Neunhoeffer dab30642fa Activate statistics already after 10 seconds. 2016-06-15 21:28:14 -07:00
jsteemann 5af79e0daf jslint 2016-06-16 00:07:34 +02:00
jsteemann f6268f5c9d sort collection names 2016-06-15 23:18:04 +02:00
Simran Brucherseifer df64666cee Change name to Foxx Legacy Compatibility Mode in Aardvaark (docu) 2016-06-15 21:29:23 +02:00
Alan Plum 3a4f19e8fb
Less noise in dev mode 2016-06-15 21:07:20 +02:00
Alan Plum f403ccecf4
Log route info if error was encountered in Foxx 2016-06-15 21:07:19 +02:00
Alan Plum 564fc24472
(2.x) Don't log response type in dev mode when no body was set 2016-06-15 21:07:19 +02:00
jsteemann 490d0a88ee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 19:10:30 +02:00
jsteemann f5c2a71534 use --log.force-direct true when executing tests 2016-06-15 19:10:07 +02:00
Jan Steemann 1726c53805 fixed some import edge cases 2016-06-15 18:16:49 +02:00
Alan Plum b13c44be3a
Oops 2016-06-15 17:14:13 +02:00
Alan Plum 4b65779cc4
Add req.trustProxy, req.arangoUser, req.arangoVersion 2016-06-15 17:11:57 +02:00
Alan Plum 7c40d6d58d
Don't expose internal request user to Foxx 2016-06-15 16:32:35 +02:00
Max Neunhoeffer 8ffbf2462e Silence repliction in unit tests. 2016-06-15 16:26:47 +02:00
Max Neunhoeffer 8239ed9ea4 Slight improvement of toArgv. 2016-06-15 16:26:13 +02:00
Mark e7516f159c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 16:19:05 +02:00
Mark 37e99291c0 fixed compatibility functions 2016-06-15 16:18:46 +02:00
Alan Plum e6b1e0642d
Remove unused system session storage 2016-06-15 16:13:46 +02:00
Alan Plum 74db8609fb
Missed one 2016-06-15 16:13:46 +02:00
Max Neunhoeffer 2bb8e4441d Sort out waiting for sync. repl. to settle at bootstrap and create DB. 
This makes startup and creating databases slower, but leads to
a lot less trouble later on. It can now no longer happen that
a collection or database is dropped before synchronous replication
has settled.
 2016-06-15 15:25:05 +02:00
Alan Plum d9394f44e1
lodash no longer accepts thisArg 2016-06-15 15:17:58 +02:00
Alan Plum e6e0f5d655
_.functions -> _.functionsIn 2016-06-15 15:09:43 +02:00
Alan Plum 2bb8957caf
Update all dependencies to latest 2016-06-15 13:47:01 +02:00
hkernbach 927c011c17 grunt build 3.0 [ci skip] 2016-06-15 04:07:43 +02:00
hkernbach 5d7e5b1fdc support view [ci skip] 2016-06-15 02:29:15 +02:00
hkernbach ddffdf0c69 scss [ci skip] 2016-06-15 01:35:30 +02:00
hkernbach c04713c563 updated grunt dependency versions 2016-06-15 00:51:44 +02:00
hkernbach 64b67f106f grunt build [ci skip] 2016-06-15 00:38:01 +02:00
hkernbach df3121daf6 scss lint [ci skip] 2016-06-15 00:34:31 +02:00
hkernbach 41ecffcbf0 select2 collection view bugfix 2016-06-15 00:33:40 +02:00
hkernbach 55f4e2c32c scss [ci skip] 2016-06-15 00:18:23 +02:00
hkernbach a43ae187d0 better handling database creation [ci skip] 2016-06-15 00:18:13 +02:00
hkernbach bdf3539ced collection type bugfix 2016-06-14 23:53:09 +02:00
hkernbach ce7d446d11 slack icon [ci skip] 2016-06-14 23:25:57 +02:00
hkernbach 76016bc7aa slack icon [ci skip] 2016-06-14 23:25:39 +02:00
hkernbach c2084840c6 slack icon html fix [ci skip] 2016-06-14 23:23:04 +02:00
hkernbach 14077a59bd added slack icon [ci skip] 2016-06-14 23:18:45 +02:00
hkernbach 83c66cbaaf removed comment [ci skip] 2016-06-14 20:18:24 +02:00
hkernbach 3297a294b2 option to disabled auth message 2016-06-14 20:17:11 +02:00
hkernbach ebd5f4f077 auth warning change 2016-06-14 19:52:16 +02:00
hkernbach c79f3b740e grunt 2016-06-14 19:27:55 +02:00
hkernbach 7e66d2a3a9 query view bugfix when receiving a conflict http 2016-06-14 19:23:04 +02:00
hkernbach 166d7edd95 removed not needed animation 2016-06-14 19:08:53 +02:00
hkernbach c0f1adaed9 console logs 2016-06-14 18:58:09 +02:00
hkernbach 6a44df6cad query view event bugfix [ci skip] 2016-06-14 18:54:22 +02:00
hkernbach 130c13bf34 added breadcrumb to graph view [ci skip] 2016-06-14 18:41:59 +02:00
hkernbach dea180e205 grunt build [ci skip] 2016-06-14 18:33:46 +02:00
hkernbach 9efc7aec5f added font roboto locally [ci skip] 2016-06-14 18:32:37 +02:00
hkernbach 05b03e9d77 ie fix 2016-06-14 17:59:24 +02:00
hkernbach e247759c29 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 17:25:59 +02:00
hkernbach 5c86401355 fixed documentation link [ci skip] 2016-06-14 17:22:19 +02:00
hkernbach f014cf964b fixed modal display bug [ci skip] 2016-06-14 17:22:01 +02:00
Alan Plum a8219b4818
Unbreak the build I say 2016-06-14 17:20:06 +02:00
Alan Plum 0f5b4624ea
Unbreak the build 2016-06-14 17:18:40 +02:00
Wilfried Goesgens 98f3258eef fresh swagger. 2016-06-14 17:14:17 +02:00
Kaveh Vahedipour 66e6315113 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 17:14:00 +02:00
Kaveh Vahedipour 0f66a110de fixed max_elements bug in job transactions 2016-06-14 17:13:52 +02:00
Wilfried Goesgens b705f3613f fresh swagger. 2016-06-14 16:49:37 +02:00
Kaveh Vahedipour a3694e7a01 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:39:17 +02:00
Kaveh Vahedipour 1b77bc7a83 ageny tests 2016-06-14 16:39:07 +02:00
Alan Plum 0867e8aa87
Validate request headers also 2016-06-14 16:29:36 +02:00
Alan Plum 4466925398
Remove redundant quotes 
[skip ci]
 2016-06-14 16:29:33 +02:00
Alan Plum 45488ef615
Make param validation errors more descriptive 2016-06-14 16:29:31 +02:00
Alan Plum 8639ebb4cf
Rename 'reason' to 'description' 
[skip ci]
 2016-06-14 16:29:29 +02:00
hkernbach 30b4c8aca5 Merge branch 'uditha-atukorala-devel' into devel 2016-06-14 16:27:11 +02:00
Max Neunhoeffer 1be89d4667 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 16:20:38 +02:00
Max Neunhoeffer 5153b230b8 Wait for sync repl to settle after db create. 2016-06-14 16:20:18 +02:00
jsteemann 83466c2342 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:14:21 +02:00
jsteemann 4b8f2d4594 jslint 2016-06-14 16:14:15 +02:00
jsteemann 34877186dd make user-defined AQL functions throw again 2016-06-14 16:14:02 +02:00
hkernbach 498742ceb2 Merge branch 'devel' of https://github.com/uditha-atukorala/arangodb into uditha-atukorala-devel 2016-06-14 16:12:40 +02:00
Max Neunhoeffer 3e1b745f64 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 15:59:45 +02:00
Max Neunhoeffer 6ae19f3987 Move waiting code to @arangodb/cluster.js 2016-06-14 15:59:20 +02:00
Max Neunhoeffer 527b9159dd Minor corrections. 2016-06-14 15:58:53 +02:00
hkernbach f7687a3326 jslint + grunt build 2016-06-14 15:44:50 +02:00
Max Neunhoeffer 6dba665a34 At create database wait for synchronous replication to kick in. 2016-06-14 15:40:55 +02:00
hkernbach 8d8f935cd4 support view [ci skip] 2016-06-14 15:24:21 +02:00
hkernbach dbf3dafdde Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 15:09:32 +02:00
Kaveh Vahedipour ab593bfa94 error handling in rest handling and random generator in constituent 2016-06-14 14:51:48 +02:00
hkernbach 10dcc377ef Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 14:36:43 +02:00
hkernbach 0c9e0e7c66 ie + edge cache fixes 2016-06-14 14:36:32 +02:00
Max Neunhoeffer 85d64d0eae Do not retry for too long to synchronize a shard. 2016-06-14 13:54:53 +02:00
Andreas Streichardt 9247f759c2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 13:08:24 +02:00
Andreas Streichardt 85593ba179 useless jslint 2016-06-14 13:08:12 +02:00
Wilfried Goesgens 77fdf8c31c Fix copying of arangod for later crash analysis; don't default to /var/tmp/ so regular cleanup jobs can catch it. 2016-06-14 13:05:47 +02:00
Alan Plum 2c8732e674
Fix aardvark foxx icon size 2016-06-14 11:56:33 +02:00
Max Neunhoeffer 3348e8769d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 10:57:59 +02:00
Max Neunhoeffer b6ba8f841c Lower info level of some warning. 2016-06-14 10:51:15 +02:00
Max Neunhoeffer 9c74d6a076 Properly protect traffic in Sync Keyspace. 2016-06-14 10:49:28 +02:00
Andreas Streichardt b82290cc13 Centralize downloading 2016-06-14 10:11:37 +02:00
Max Neunhoeffer 7e84980153 Log level in tests. 2016-06-14 00:32:35 +02:00
Max Neunhoeffer 418111b942 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 00:13:23 +02:00
Max Neunhoeffer 9d42790580 Take out a debugging print. 2016-06-14 00:13:09 +02:00
hkernbach 5a351d8344 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 00:11:44 +02:00
hkernbach 7b9fd624e9 shard view [ci skip] 2016-06-14 00:11:34 +02:00
Max Neunhoeffer 982b4e1735 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 00:09:00 +02:00
Max Neunhoeffer 82ac357b2a Less debugging output. 2016-06-14 00:08:42 +02:00
Max Neunhoeffer 66ae93bf1f More patience to wait for supervision to finish jobs. 2016-06-14 00:08:24 +02:00
Max Neunhoeffer 5bbcc6cd02 Lower logging level in tests for replication topic. 2016-06-14 00:07:44 +02:00
hkernbach 6e8a5f78d5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 00:05:52 +02:00
hkernbach fc8c8dea52 grunt build [ci skip] 2016-06-14 00:05:44 +02:00
Max Neunhoeffer c0b48dcc4a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-13 23:55:21 +02:00
hkernbach ca897dce25 css for internet explorer :) [ci skip] 2016-06-13 23:42:38 +02:00
hkernbach 4d9c8356dd added global ajax cache flag to prevent IE end EDGE from caching everything [ci skip] 2016-06-13 23:29:55 +02:00
Max Neunhoeffer 79025546f7 Improve moveShard tests and testing infrastructure. 2016-06-13 23:28:32 +02:00
hkernbach 5dee5948b6 included version in foxx-zip download name 2016-06-13 21:07:04 +02:00
hkernbach 0073f621b1 grunt build [ci skip] 2016-06-13 20:47:51 +02:00
hkernbach 9335739c21 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-13 20:40:50 +02:00
hkernbach d844ff790f shard view 2016-06-13 20:40:14 +02:00
Uditha Atukorala 725bb69f75 drop duplicate cleanup functionality 2016-06-13 18:45:08 +01:00
Andreas Streichardt 104cd2fed5 Fix cluster statistics 2016-06-13 19:42:13 +02:00
Uditha Atukorala 3e78f1313e fix dygraph data cleanup logic 2016-06-13 18:42:01 +01:00
hkernbach a36f4705fb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-13 19:35:22 +02:00
Uditha Atukorala bd073a142f remove residentSize from dygraph configs since it is not used any more 2016-06-13 18:34:48 +01:00
Alan Plum 3ac6139fdc
Also format JSON body in res.write & res.body 2016-06-13 18:30:38 +02:00
hkernbach 48635954de shard view [ci skip] 2016-06-13 15:56:14 +02:00
hkernbach 99de04eee9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-13 15:49:46 +02:00
hkernbach 55f9647f47 shard view + menu 2016-06-13 15:49:35 +02:00
Kaveh Vahedipour d130743a73 shrinkCluster tests 2016-06-13 15:15:10 +02:00
Mark 328b7681f1 Test format fix 2016-06-13 14:44:33 +02:00
Mark 705edefe41 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 14:37:50 +02:00
Max Neunhoeffer c3d9336450 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-13 14:37:38 +02:00
Mark 822fb3282f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 14:37:16 +02:00
Max Neunhoeffer 0040105e80 Finish transformation to three digit numbers in server IDs. 2016-06-13 14:37:15 +02:00
Mark 23d1a204b6 breadth first tests added 2016-06-13 14:36:52 +02:00
Alan Plum 279ec5e973
Also handle defaultDocument in non-legacy services 2016-06-13 14:27:26 +02:00