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

36736 Commits

Author SHA1 Message Date
Max Neunhoeffer 38812fa9d2 Lower log level to debug in shutdown message. 2017-02-16 13:40:45 +01:00
jsteemann 581e280e2e log fatal, err and warn always in non-threaded mode 2017-02-15 00:09:02 +01:00
jsteemann 7c67d64179 cppcheck 2017-02-15 00:07:14 +01:00
jsteemann ea54cb265a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 23:06:56 +01:00
jsteemann ed5816bf7d updated CHANGELOG 2017-02-14 23:06:33 +01:00
jsteemann 977190d048 documentation for XML export 2017-02-14 23:05:52 +01:00
Jan Christoph Uhde b38c8bfc9a Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  added generic XML export
  simplify handling of possible values
  nicer printing of possible values
  constified some parameters, fixed escaping of some values
 2017-02-14 23:04:51 +01:00
jsteemann 0aaa097fa6 added generic XML export 2017-02-14 22:57:58 +01:00
jsteemann 6bc5cc7294 simplify handling of possible values 2017-02-14 22:21:15 +01:00
jsteemann 35fef99b61 nicer printing of possible values 2017-02-14 22:20:45 +01:00
jsteemann e60b774ae7 constified some parameters, fixed escaping of some values 2017-02-14 22:11:56 +01:00
Jan Christoph Uhde 586443ca7b Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  JWT uses seconds
  Linting
  Clarify session TTL vs cookie TTL
  More cookie options
  fixed missing semicolon
  optimized graph management view
  REALLY fix routing tests
  Really fix routing
  Fix routing
  allow to specify the directory for the windows client build
  Fix Foxx routing
  Define Foxx's expected routing behaviour
  Spring cleaning
  potential fixes for MSVC
 2017-02-14 22:02:20 +01:00
jsteemann 0f6e1f5471 updated CHANGELOG 2017-02-14 22:00:01 +01:00
Alan Plum 622b4fac4b
JWT uses seconds 
Fixes #2249.
 2017-02-14 19:20:41 +01:00
Alan Plum 7471f94fa7
Linting 2017-02-14 19:20:41 +01:00
Alan Plum 54f5ebea74
Clarify session TTL vs cookie TTL 
Addresses #2041 (comment 245505999).
 2017-02-14 19:20:40 +01:00
Alan Plum 5a02a8983f
More cookie options 
Fixes #2085.
 2017-02-14 19:20:40 +01:00
Frank Celler 511e907c58 fixed missing semicolon 2017-02-14 18:20:34 +01:00
hkernbach cf636b6970 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-14 18:06:43 +01:00
hkernbach 1a5112da79 optimized graph management view 2017-02-14 18:06:29 +01:00
Alan Plum 022ff11886
REALLY fix routing tests 2017-02-14 17:18:40 +01:00
Alan Plum 01f83c20a2
Really fix routing 2017-02-14 17:15:44 +01:00
Alan Plum d72be1cf74
Fix routing 2017-02-14 17:15:06 +01:00
Wilfried Goesgens e10dca6417 allow to specify the directory for the windows client build 2017-02-14 17:07:59 +01:00
Alan Plum 0f4b932717
Fix Foxx routing 2017-02-14 16:36:40 +01:00
Alan Plum d72f3ea511
Define Foxx's expected routing behaviour 2017-02-14 16:36:40 +01:00
Alan Plum 2eb8f30c7f
Spring cleaning 
Also removed actions.rewriteRouting as it is not actually used anywhere.
 2017-02-14 16:36:40 +01:00
Jan Christoph Uhde ce3b1ff9b5 Merge branch 'obi-storage' into devel 
* obi-storage:
  move compation locking / figures out of logical collection

Conflicts:
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.h
 2017-02-14 16:14:25 +01:00
jsteemann 8c9dd79aeb potential fixes for MSVC 2017-02-14 16:11:18 +01:00
jsteemann 1b5445731b potential fixes for MSVC 2017-02-14 16:01:00 +01:00
Kaveh Vahedipour 37472ddcdc revisited the appendEntries API 2017-02-14 15:18:07 +01:00
Kaveh Vahedipour b6756bad65 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 15:08:03 +01:00
Kaveh Vahedipour 05250b6c7b back port of bug fixes in 3.1 2017-02-14 15:07:51 +01:00
jsteemann 8a2e353f3d move encoding functions into their own file 2017-02-14 12:57:15 +01:00
jsteemann be77decb2d remove an unused include 2017-02-14 12:39:50 +01:00
jsteemann cbe8ee1172 renamed feature 2017-02-14 12:35:54 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
Jan Christoph Uhde 071d147c5f move compation locking / figures out of logical collection 2017-02-14 12:34:46 +01:00
jsteemann 8e912ef4dc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 12:08:16 +01:00
jsteemann c5fc5d3fe8 added assertions 2017-02-14 12:01:52 +01:00
jsteemann 2cebe3de66 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 12:01:36 +01:00
hkernbach b40c33bfbd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-14 11:47:51 +01:00
hkernbach bf9250fdb1 grunt 2017-02-14 11:47:38 +01:00
hkernbach 559b8d371d fixed memory issue within ui dashboard 2017-02-14 11:44:37 +01:00
Michael Hackstein 6605a01410 Moved lookupDocument form LogicalCollection into MMFilesCollection. It is SE specific. 2017-02-14 11:37:45 +01:00
jsteemann 9ede671aa3 pre-reserve array 2017-02-14 11:34:34 +01:00
jsteemann 107620708c remove now useless decodeURIComponent calls 2017-02-14 11:29:08 +01:00
jsteemann ff956f1696 expose rawSuffix 2017-02-14 11:25:12 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +01:00
Michael Hackstein 32bd15d098 Renamed collection->update() to update the properties of a collection to collection->updateProperties(). There is another update() which is used for the stored Documents. 2017-02-14 10:32:24 +01:00