1
0
Fork 0
Commit Graph

23248 Commits

Author SHA1 Message Date
Frank Celler a85c44b25e removed commented out lines, less verbose help 2015-10-09 13:51:18 +02:00
hkernbach 6cc0d4d184 new webui grunt build 2015-10-09 10:30:14 +02:00
Frank Celler b58d0702bd fixed number of contexts for ARM 2015-10-08 15:26:40 +02:00
hkernbach d066a4283c issue: #1446 2015-10-08 14:02:36 +02:00
Frank Celler 854ce2007d use static readline 2015-10-08 13:36:59 +02:00
Jan Steemann 53d2787cf6 added test case for routing and binary req/res 2015-10-08 10:18:36 +02:00
Michael Hackstein ef78f03309 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-07 17:05:02 +02:00
Michael Hackstein ab23a01263 Properly react to return value 2015-10-07 17:04:56 +02:00
Jan Steemann 71a25e798b mchacki: fixed development mode 2015-10-07 17:03:49 +02:00
Jan Steemann ef04ccdc8c fixed expansion node cloning 2015-10-07 17:03:17 +02:00
Michael Hackstein f498494738 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-07 15:55:33 +02:00
Frank Celler b572db4f19 style guide 2015-10-07 15:54:18 +02:00
Michael Hackstein 16369c7ac5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-07 15:51:06 +02:00
Michael Hackstein 1ba2efed60 Fixed GraphNeighbors as locking was not woring for include data 2015-10-07 15:50:41 +02:00
Frank Celler 4b0911c799 added debugging header x-arango-v8-context 2015-10-07 13:37:35 +02:00
Jan Steemann 4f6b590ddc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-07 10:15:50 +02:00
Jan Steemann d54db0e3ff do not warn verbosely 2015-10-07 10:15:34 +02:00
Frank Celler 8849e184ca fixed default language 2015-10-07 09:47:17 +02:00
Frank Celler 459c5b2c7e changed to atomic 2015-10-07 09:47:17 +02:00
jsteemann 358befddde added test for issue #1521 2015-10-06 22:36:09 +02:00
jsteemann c5cb00f56d removed unused methods 2015-10-06 21:38:49 +02:00
jsteemann d20c99a5da issue #1521: Can't dump/restore with user and password
Conflicts:
	CHANGELOG
2015-10-06 21:37:56 +02:00
Alan Plum ea44c7710c Rebuild aardvark 2015-10-06 16:35:00 +02:00
Alan Plum 3325d46211 Unbreak aardvark shell 2015-10-06 16:18:23 +02:00
Alan Plum 820e694d0c Re-implement cleanupCancelation 2015-10-06 15:10:43 +02:00
Alan Plum 5b7f3d19d0 Deprecate CS in 2.9, not 2.8 2015-10-06 12:47:58 +02:00
Jan Steemann 849dad60cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-06 11:58:52 +02:00
Jan Steemann beaf3acbd3 simplifications 2015-10-06 11:58:23 +02:00
Alan Plum 7332f3803e Make org/arangodb/deprecated work in arangosh without db 2015-10-06 11:37:42 +02:00
Jan Steemann 391e9b1693 improved error message on startup 2015-10-05 11:53:22 +02:00
Jan Steemann 2219bfd441 updated CHANGELOG 2015-10-05 11:47:28 +02:00
Jan Steemann d9d2784a84 make replication start with 2.6 configuration 2015-10-05 11:07:58 +02:00
Jan Steemann 7c428aceb9 increase default value of `--server.descriptors-minimum` to 1024 2015-10-05 11:07:03 +02:00
Jan Steemann 3f622d71fb fixed some require issues 2015-10-05 10:28:44 +02:00
jsteemann c302b9153a added stringification for TRI_json_t 2015-10-02 21:10:34 +02:00
Jan Steemann 32556a828e fixed potentially invalid cast 2015-10-02 17:40:34 +02:00
Wilfried Goesgens 232d0601cb fix running of arangosh tests with the proper parametrization. 2015-10-02 15:47:01 +02:00
Wilfried Goesgens a968707134 Fix foxx-manager test for running in arangosh 2015-10-02 15:39:49 +02:00
Wilfried Goesgens 3060e1d63d lintify: break lines. 2015-10-02 15:01:38 +02:00
Wilfried Goesgens 353c01f04f don't output the result json when running from an interactive shell. 2015-10-02 14:47:57 +02:00
Wilfried Goesgens 93bc281e39 Fix naming & removing of temp directories. 2015-10-02 13:50:07 +02:00
Wilfried Goesgens a5d8c12067 unittesting framework
- don't output xml reports if we run single tests
  - add another token to the 'this is not a testcase name' list
2015-10-02 13:38:25 +02:00
Jan Steemann fbdeb5ef5f make 2.7 replication compatible with 2.6 2015-10-02 12:55:15 +02:00
Wilfried Goesgens 320ac8e1e8 Improve indent readability 2015-10-02 12:31:09 +02:00
Jan Steemann 676daf398d attempt to get rid of compiler warning 2015-10-02 10:49:14 +02:00
hkernbach db7533acf8 jslint fix 2015-10-02 10:23:08 +02:00
hkernbach 3beb6a280f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-02 10:02:30 +02:00
hkernbach 51a20beef3 graph test view 2015-10-02 10:02:25 +02:00
Wilfried Goesgens 5d14199729 Merge pull request #1518 from CoDEmanX/devel
Documentation formatting
2015-10-02 09:27:07 +02:00
CoDEmanX 41d6594246 Documentation formatting 2015-10-02 03:14:55 +02:00