1
0
Fork 0
Commit Graph

28320 Commits

Author SHA1 Message Date
hkernbach bcaadd878f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 21:56:52 +02:00
hkernbach 5c153730d2 view, subviews, scss 2016-04-14 21:56:43 +02:00
Jan Steemann bccbfc8042 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 20:57:31 +02:00
Jan Steemann 46e5150272 micro optimizations 2016-04-14 20:57:24 +02:00
Max Neunhoeffer dab12cbeed Take out a debugging message. 2016-04-14 20:20:56 +02:00
Andreas Streichardt 49d0407859 Trace vs info again 2016-04-14 18:23:08 +02:00
Andreas Streichardt 23af9480f6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 18:18:16 +02:00
Andreas Streichardt 612c387c56 Optimize version increase stuff 2016-04-14 18:17:25 +02:00
Wilfried Goesgens 177d159282 get some inspiration from https://github.com/sleepycat/arangodb-git_arch/blob/master/arangodb.service 2016-04-14 18:11:14 +02:00
Kaveh Vahedipour 333d53e733 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:29:46 +02:00
Kaveh Vahedipour 2dcf897797 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 17:27:17 +02:00
Kaveh Vahedipour db4b527df5 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:27:06 +02:00
Kaveh Vahedipour 67c06047f3 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:17:37 +02:00
Max Neunhoeffer c71788ef32 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 16:51:01 +02:00
Max Neunhoeffer bd1fd8fc3d Fix AgencyComm::getValues. 2016-04-14 16:50:46 +02:00
Kaveh Vahedipour f9716fee62 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 16:41:18 +02:00
Kaveh Vahedipour 393b068ac4 store's operator handling 2016-04-14 16:40:25 +02:00
hkernbach 20c80aa35e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:38:47 +02:00
hkernbach b7e6b5dfca jslint frontend 2016-04-14 15:38:39 +02:00
Andreas Streichardt 7a8f101cfc Merge branch 'devel' into agency 2016-04-14 15:31:14 +02:00
Andreas Streichardt 3160b3cccb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:30:34 +02:00
Andreas Streichardt 10461fe369 Fix cluster shutdown time 2016-04-14 15:30:19 +02:00
Kaveh Vahedipour 544b8df334 signle instance agency doesn't need to utilize thread in Agent 2016-04-14 14:57:39 +02:00
Kaveh Vahedipour 05db051950 agency test for assigning objects through op set new ttl 2016-04-14 14:34:15 +02:00
Kaveh Vahedipour 220132f5e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 14:05:05 +02:00
Kaveh Vahedipour 01ec96f859 correct handling of objects in agency op set 2016-04-14 14:03:42 +02:00
hkernbach 7f15bba720 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 13:54:18 +02:00
hkernbach 128caabd92 scss lint 2016-04-14 13:54:09 +02:00
Wilfried Goesgens 924fae53f9 Autodetect a nuget installation of openssl in the users windows home directory 2016-04-14 13:40:17 +02:00
Wilfried Goesgens e173d26aa9 remove directory mangling for our old windows special library directory mechanism 2016-04-14 13:38:52 +02:00
Max Neunhoeffer 79d709a01c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 13:30:23 +02:00
Max Neunhoeffer 87197cd843 Fix lock() in AgencyComm. 2016-04-14 13:30:07 +02:00
Andreas Streichardt 1794be7c30 Version is now an Uint64 consistently 2016-04-14 13:29:36 +02:00
hkernbach 020c3df628 lib + frontend grunt build 2016-04-14 13:24:18 +02:00
Andreas Streichardt a9b282a231 Init done in one step 2016-04-14 13:12:57 +02:00
hkernbach 163e58898b Merge remote-tracking branch 'origin/frontendmerge' into devel 2016-04-14 13:08:43 +02:00
hkernbach 526b686cc5 grunt 2016-04-14 13:01:17 +02:00
hkernbach 9d3386cc28 frontend 2016-04-14 13:00:27 +02:00
Jan Steemann 5c17402536 reduce number of agency requests a bit 2016-04-14 11:40:21 +02:00
Wilfried Goesgens 59aa53a6d1 MacosX package: build plist file from cmake 2016-04-14 10:46:47 +02:00
Wilfried Goesgens 8ae9ed7b4e Only need to install icu data files on windows, others have them hardwired at build time. 2016-04-14 10:46:04 +02:00
hkernbach 4ff4729e0f view, scss 2016-04-14 09:43:32 +02:00
Michael Hackstein 32a5ed5972 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 09:04:34 +02:00
Michael Hackstein bce15b7345 Actually deactivated the agency.wait-for-sync for tests. 2016-04-14 09:04:26 +02:00
Kaveh Vahedipour c88bd4c1a8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 20:08:17 +02:00
Kaveh Vahedipour 4321ef5fa5 opteration options need only be defined once in state 2016-04-13 20:08:00 +02:00
Kaveh Vahedipour 46c04dce52 Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-13 17:57:51 +00:00
Kaveh Vahedipour c40a13f262 Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-13 19:41:47 +02:00
Kaveh Vahedipour fa6e12efe4 option to turn off sync for wait on every persistence call 2016-04-13 19:40:19 +02:00
Andreas Streichardt 0ed24b7465 Merge branch 'agency' into devel 2016-04-13 19:35:30 +02:00