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

807 Commits

Author SHA1 Message Date
= 63451527c3 modifications in project file 2014-05-01 14:09:12 +02:00
= 352cd175c6 every body get access rights to shared mem segment of installer 2014-05-01 14:03:09 +02:00
= 31f8ebbab7 Changes in Projectfile 2014-04-25 09:42:11 +02:00
= 066816ae82 Source and DLL are consistent. Painfull error!!! 2014-04-25 08:46:57 +02:00
= ab4e60d861 correct verion of plugin 2014-04-24 17:48:34 +02:00
= ce54ce59f8 corresponding dll for commit 45082d504449b5faa31d337dd388d08c5df77dd9 2014-04-23 17:27:22 +02:00
= 4dbeecd329 Bug fix: shared memory bug hints correct work of installer under win32 2014-04-23 17:17:15 +02:00
= c88bd557e3 bug fix in installation directory for all users 2014-04-22 14:00:37 +02:00
= 584770adcd New Plugin SharedMem is commited 2014-04-17 15:36:17 +02:00
= cb050df7d1 default installation direectory is not more documents 2014-04-17 09:35:48 +02:00
= bd6c0e343b refactoring: reg keys are written after arango was installed succefull 2014-04-17 09:02:43 +02:00
= 5943230a47 cleaning orthographical errors 2014-04-17 08:29:21 +02:00
= d3bb58a9ad Using shared memmory plugin for interprocess communication 2014-04-16 17:35:09 +02:00
= 4584ae94c8 used pluging for assiginig appropiate rights to arango software 2014-04-14 09:42:40 +02:00
= 1d9f15ed8a code refactoring 2014-04-10 17:29:33 +02:00
= 2099344317 RegKey "type" is save in HKCC or HKCU for determining the uninstaller modus 2014-04-10 16:05:51 +02:00
= 4ae2951163 showing pages in dependence of child or father process installer 2014-04-10 10:22:29 +02:00
= 4594635db6 bug fix: directory permissions are considered during install process 2014-04-07 16:52:39 +02:00
= eba11a7074 Bug Fix: checking access rights 2014-04-04 12:23:42 +02:00
Frank Celler e07aada517 fixed typo 2014-03-20 14:29:38 +01:00
Frank Celler 1865e2c895 fixed wording for install script 
Conflicts:

	Installation/Windows/Templates/NSIS.InstallOptions.ini.in
 2014-03-20 09:36:35 +01:00
Esteban Lombeyda e922021940 too many white spaces were deleted 2014-03-03 14:10:31 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
 2014-02-28 20:37:05 +01:00
Esteban Lombeyda 05daddaf1d only arango icons are exported in to installation directory 
SimpleService Plugin was copied in to project directory in order to allow
an automatic build of arango under windows
 2014-02-28 18:27:53 +01:00
Esteban Lombeyda f7f6561dfe Bug Fix: RegKeys and ShortCuts are allways after desinstall deleted 2014-02-28 17:43:54 +01:00
Esteban Lombeyda 9d82a5daad acoppling NSIS.InstallOptions.ini.in for arango installation 2014-02-28 12:11:20 +01:00
Frank Celler 3c992b0bbe removed old files 2014-02-27 13:16:54 +01:00
Esteban Lombeyda bd15248198 using paths correct paths, starting as service 2014-02-25 16:50:47 +01:00
Esteban Lombeyda 2738738acc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-18 13:17:31 +01:00
Esteban Lombeyda bd83372050 Bug Fixes: RegKey are written into correct Directories 
Default Directories are correct displayed
 2014-02-18 13:14:57 +01:00
Frank Celler 9c4dafebf1 put into separat scripts to hunt down travis problems 2014-02-17 16:12:29 +01:00
Frank Celler 8bed67d1ee fixed issue #716 2014-01-13 18:28:45 +01:00
Frank Celler 9a0f817e5b fixed from config 2013-12-26 16:02:56 +01:00
Frank Celler ad7385909e removed foxx-manager and arango-dfdb shell scripts, removed uid config file 2013-12-23 17:11:10 +01:00
Frank Celler 7e30dc0b4e MacOS bundle 2013-12-23 16:03:38 +01:00
Frank Celler 85c780fbbe added icon path and more nsis info 2013-12-16 12:18:02 +01:00
Frank Celler 35af9593a4 fixed wrong path in install script 2013-12-07 18:56:14 +01:00
Frank Celler 9762913717 fixed typo in arg 2013-11-23 20:47:43 +01:00
Frank Celler 10592ea06b added tmp-path 2013-11-23 15:52:51 +01:00
Frank Celler 665ac9ad8b fixed conf file in info message 2013-11-07 21:15:57 +01:00
Frank Celler 058f435b1c release version 1.4.1-rc1 2013-11-07 20:51:47 +01:00
Frank Celler e019733609 used uid and gid 2013-11-07 14:23:07 +00:00
Frank Celler aa9bae1daa fixed test for sh 2013-11-06 22:34:53 +00:00
Frank Celler 7cbbdb8088 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-11-06 22:29:25 +00:00
Frank Celler d5d56cc5f6 fixed hash bang and test 2013-11-06 22:29:08 +00:00
Frank Celler 8263781a2d fixed hash bang and test for sh 2013-11-06 23:03:57 +01:00
Frank Celler 6806d213b1 no daemon when upgrading 2013-11-06 09:07:12 +01:00
Frank Celler 434ac7f921 fixed path, added exec, excluded databases 2013-11-05 15:13:30 +00:00
Frank Celler 11683a60a2 added debian 2013-11-02 22:16:43 +01:00
Frank Celler 36be4b1ffc added debian build rule 2013-11-02 22:14:03 +01:00
Jan Steemann 7f58b05df9 added help text 2013-10-30 11:19:22 +01:00
Frank Celler ff36cad3a8 release version 1.4.0 2013-10-29 11:27:35 +01:00
Frank Celler bbab641852 fixed paths (again) 2013-10-27 21:03:38 +01:00
Frank Celler 98b5618bc8 fixed paths, added docs 2013-10-27 20:50:55 +01:00
Frank Celler 74f8b196d5 added ARANGODB_ROOT 2013-10-27 20:28:21 +01:00
Frank Celler 96d3c32cb7 added startup script 2013-10-27 20:14:48 +01:00
Frank Celler b294240fda moved to icu 52.1 for Mavericks 2013-10-26 15:50:43 +02:00
Jan Steemann dc371c8e66 fix packetize 2013-10-01 10:54:13 +02:00
Jan Steemann 3bad3a779a fixed packetize 2013-10-01 10:44:58 +02:00
Jan Steemann d9ebf2a394 added message about logs 2013-10-01 09:31:25 +02:00
Jan Steemann 04df715864 applied fixes that occurred during build 2013-09-30 18:03:52 +02:00
Jan Steemann 1c7a22560b removed make wiki 2013-09-05 14:14:13 +02:00
Jan Steemann fe07b51beb removed Makelocal.local, moved tasks into Documentation makefile 2013-08-28 18:56:32 +02:00
Frank Celler 52e90633b2 updated manual for 1.4 2013-08-08 14:41:12 +02:00
Frank Celler 0191273ce9 removed wiki pages 2013-08-08 14:07:29 +02:00
Jan Steemann 348ec5f12f updated README 2013-08-02 15:38:10 +02:00
a-brandt 623c3af246 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-05-17 17:26:45 +02:00
a-brandt 6886a2b512 bugfix wrong return codes 2013-05-17 17:26:01 +02:00
Jan Steemann 74735bf1c3 re-make examples before publishing docs 2013-05-13 11:59:07 +02:00
Frank Celler f57c73f1ec fixed Upgrading, fixed copy of cheat-sheet 
Conflicts:
	Makefile.in
 2013-05-12 19:56:48 +02:00
a-brandt 30c2557982 changed sublist for js files 2013-04-24 16:38:49 +02:00
a-brandt d8193cb9f4 added --enable-all-in-one-v8 for openSUSE 2013-04-12 17:56:04 +02:00
a-brandt 4b2cac5ba0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-08 13:20:51 +01:00
Jan Steemann 7ad4cea138 issue #442: pls update post install info on osx 2013-03-08 13:16:20 +01:00
a-brandt af3cdfa839 added missing = 2013-03-07 11:04:39 +01:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
 2013-02-21 14:21:59 +01:00
Frank Celler 830163707e fixed path of reference card 2013-02-21 14:13:06 +01:00
a-brandt 1d2757323b added fedora 2013-02-20 16:06:23 +01:00
a-brandt 4ecff49c87 updates for epm builds 2013-02-20 09:33:37 +01:00
a-brandt a78705a7c1 moved arangod.conf 2013-02-18 09:25:48 +01:00
Frank Celler 5eeb0b6e93 added new cheat sheet 2013-02-15 15:17:02 +01:00
a-brandt 3e24a8c212 moved the arangod.conf file 2013-02-15 13:51:57 +01:00
a-brandt 3b92c8ce09 deleted --gid X and --uid X 2013-02-15 13:49:20 +01:00
a-brandt 4ff839d5b7 Merge branch '1.2' of github.com:triAGENS/ArangoDB into 1.2 2013-02-15 13:44:03 +01:00
a-brandt ae22bae6a9 deleted --gid X and --uid X 2013-02-15 13:43:17 +01:00
Frank Celler 2b41083008 changed to from -nouid to -uid 2013-02-15 13:33:25 +01:00
Frank Celler b1bd5827ad fixed issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:52:17 +01:00
a-brandt 8cadfc3303 added upgrade message 2013-02-13 15:30:58 +01:00
a-brandt f9cff6a507 added an upgrade message 2013-02-13 12:55:56 +01:00
a-brandt bcd69029d9 added command "upgrade" to upgrade the database files 2013-02-12 13:31:03 +01:00
a-brandt 0105c66489 deleted "--gid arangodb" 2013-02-08 16:57:42 +01:00
a-brandt c57501d5e6 added optional server options (to start server with "/etc/init.d/arangod start --upgrade") 2013-02-08 13:59:41 +01:00
a-brandt 3b4efac0e9 force: make setup 2013-02-06 10:16:27 +01:00
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
 2012-12-18 13:37:34 +01:00
a-brandt 4bd3a84a09 updates 2012-12-17 10:47:29 +01:00
a-brandt f1e0edd0ab Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-12-07 10:21:09 +01:00
a-brandt 30312dd596 diable mruby for MacOS X 2012-12-07 10:20:09 +01:00
Frank Celler 18e5f884eb added troubleshooting, fixed css, fixed OBS 2012-12-06 16:58:38 +01:00
Frank Celler 4cf160549a added windows, fixed version number 2012-12-06 16:58:38 +01:00
Frank Celler c1de76382a added open build service files 2012-12-06 16:58:38 +01:00
Frank Celler fd83731abe added open build service files 
added index.html from open build service
 2012-12-06 16:58:37 +01:00
a-brandt ed4a634d71 added missing arango-passwd 2012-12-06 10:15:17 +01:00
a-brandt 7cab2f055b added systemd for openSUSE 12 2012-12-04 11:28:38 +01:00
a-brandt 968a2b91b6 added systemd for openSUSE 12 2012-12-04 11:22:58 +01:00
Jan Steemann d60888e970 replaced arango-upgrade script with server startup option --upgrade 2012-12-03 13:45:58 +01:00
a-brandt 7fdb024fef Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Installation/epm/arangodb.list
 2012-12-03 13:28:40 +01:00
Jan Steemann 42ba0502f0 changed upgrade procedure 
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
 2012-12-03 13:02:59 +01:00
Jan Steemann 59461d0c4b added functionality to add and remove users programatically 
removed arango-password script
 2012-12-03 11:42:30 +01:00
a-brandt f2674222ba added chown for upgrading version 2012-11-30 14:20:50 +01:00
a-brandt 611be56e5b do not show "mkdir Doxygen/man*" 2012-11-30 14:20:21 +01:00
a-brandt 47bcf48c5f added chown for upgrading version 2012-11-30 14:19:04 +01:00
a-brandt 22c3607314 do not show "mkdir Doxygen/man*" 2012-11-30 14:18:04 +01:00
a-brandt 6361b6d94d added remove of plist file 2012-11-30 14:16:30 +01:00
a-brandt ba3bd8f3e9 changed some values 2012-11-30 13:45:15 +01:00
a-brandt bf46d1c0fd changed some values 2012-11-30 13:44:53 +01:00
a-brandt dd3b42e933 added delete of /Library/LaunchDaemons/org.arangodb.plist 2012-11-30 13:01:37 +01:00
a-brandt ee93f226f7 added tail logfile on error 2012-11-30 12:44:23 +01:00
a-brandt 18e7cf5188 added arango-upgrade to systems 2012-11-29 17:09:54 +01:00
a-brandt 9196eef00a added arango-upgrade to systems 2012-11-29 15:31:22 +01:00
a-brandt 150bd4bc4a added missing man pages 2012-11-28 11:15:42 +01:00
a-brandt 50fb475680 added missing man pages 2012-11-28 11:15:12 +01:00
a-brandt 0da4058b01 added "use_systemd" 2012-11-23 13:02:07 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann 4cb14d7537 fixed documentation 2012-11-23 09:32:52 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
a-brandt a7c957faeb added arango-upgrade 2012-11-20 15:43:19 +01:00
a-brandt f42ceed457 changed MacOS X postinstall 2012-11-20 15:33:42 +01:00
a-brandt 283f0cd2d0 added missing arango-upgrade 2012-11-20 11:52:25 +01:00
Frank Celler 28bdd337d0 add maintainer and automagic files 
added configure to AUTOMAGIC files
 2012-11-13 16:23:01 +01:00
Frank Celler efdad9df10 add maintainer and automagic files 2012-11-13 16:18:23 +01:00
Frank Celler 4804f2b324 fixed arangoirb compile error 2012-11-13 15:57:38 +01:00
Frank Celler cf75fd05f1 fixed arangoirb compile error 2012-11-13 15:56:57 +01:00
Frank Celler 3b5a0967bc Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp
 2012-10-20 22:37:25 +02:00
a-brandt c70d081fc9 one more try for centos 5 2012-10-19 16:02:31 +02:00
a-brandt fbc20e6aed added some extra options for "make on centos 5 2012-10-19 15:26:10 +02:00
Frank Celler aaf74fe8f6 fixed title for website output 2012-10-18 17:33:21 +02:00
Frank Celler e8093d68fe upgraded to Doxygen 1.8.x 2012-10-18 16:38:20 +02:00
a-brandt 451cea6c4c bugfix wrong user 2012-10-17 12:04:16 +02:00
a-brandt b98e7671f0 bugfix wrong user 2012-10-17 12:03:01 +02:00
a-brandt 45c0f7d937 updates 2012-10-17 10:27:50 +02:00
a-brandt 07d1dfa2fc added "--build x86_64-apple-darwinXX.XX.XX" for MacOS X 2012-10-17 09:38:11 +02:00
a-brandt 83be41d2f0 disabled "mruby" 2012-10-16 17:23:42 +02:00
a-brandt 1b197a7bba configure options changed 2012-10-16 16:18:35 +02:00
a-brandt b1f25fc7e3 deleted "--enable-all-in-one" 2012-10-16 15:42:35 +02:00
a-brandt a192d73969 deleted "--enable-all-in-one" 2012-10-16 15:41:40 +02:00
a-brandt 3545ed527c added "make setup" 2012-10-16 15:05:17 +02:00
a-brandt b0f69deaf9 added "make setup" 2012-10-16 15:04:22 +02:00
Frank Celler c0c869d1ff Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/ArangoShell/ArangoClient.cpp
	js/client/js-client.h
 2012-10-13 16:28:09 +02:00
Jan Steemann e4966844f4 remove invalid configure option 2012-10-11 23:16:45 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB 
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
 2012-10-11 15:19:44 +02:00
Jan Steemann 6b24c5d7f9 fixed typo, change publish-html 2012-10-09 10:58:10 +02:00
a-brandt d869ff6b7d bugfix: chown arangod /var/run/arangodb 2012-09-25 17:48:13 +02:00
a-brandt 3cb61773e5 bugfix: wrong user 2012-09-25 17:15:22 +02:00
a-brandt e6f114e0cf added "--enable-mruby" 2012-09-25 17:05:40 +02:00
a-brandt cafcabeea5 disabled mruby 2012-09-25 16:46:55 +02:00
a-brandt c31a614ac1 changed datadir to /var/lib 2012-09-25 16:13:05 +02:00
a-brandt 791f90ffd6 bugfix 2012-09-25 16:02:32 +02:00
a-brandt 413510dcda changed path to arangod.conf 2012-09-25 16:00:55 +02:00
a-brandt e3793d6a14 changes for next version 2012-09-25 12:04:40 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Frank Celler 82864cc246 added Short-Description 2012-09-02 11:59:44 +02:00
Frank Celler f92b804ade moved default database directory 2012-09-02 10:25:28 +02:00
Frank Celler 85a36b2cfc using prg name for init-script 2012-09-01 22:53:53 +02:00
Frank Celler b755e22245 renamed web to doc for inclusion in /usr/share 2012-08-31 23:24:24 +02:00
Jan Steemann 580915ca17 changed Makefiles for Doxygen. Generated documentation is now located in Doxygen/, sources are in Documentation/ 2012-08-31 12:04:32 +02:00
Frank Celler 2ab77278d9 changes to allow SUBDIR build 2012-08-30 18:06:23 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling 
moved common functions to ArangoClient
 2012-08-30 16:54:42 +02:00
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel 
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
 2012-08-18 09:00:43 +02:00
Frank Celler 8970ff1558 fixed for issue #149: Inconsistent port for admin interface 2012-08-10 13:59:39 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
 2012-08-05 22:46:55 +02:00
Frank Celler aa2cd1c77b fix startup 2012-08-05 21:44:03 +02:00
Frank Celler 81fd398bd2 added timeout 2012-08-05 20:51:23 +02:00
Frank Celler 0d335f3b60 fixed paths for html files 2012-08-05 16:47:00 +02:00
Frank Celler f761e618be fix for issue #134: improvements for centos RPM 2012-08-03 13:26:35 +02:00
Frank Celler 4c404dc095 partial fix for issue #134 "improvements for centos RPM" 2012-08-03 13:11:24 +02:00
Frank Celler d7b2617348 fixed disable-admin-interface switch 2012-08-03 09:05:11 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
 2012-07-26 12:03:03 +02:00
a-brandt ad8c74f6e0 bugfix 2012-07-25 14:59:00 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +02:00
Jan Steemann a910971b15 fixed documentation & installation settings after endpoint introduction 2012-07-24 08:42:45 +02:00
Frank Celler bc3d08d5c6 Merge branch 'master' of github.com:triAGENS/ArangoDB into 1.0 2012-07-16 17:57:07 +02:00
a-brandt 72626a5abf changed owner of logfile directory 2012-07-16 17:28:01 +02:00
Frank Celler 16407018d7 fixed relative paths 2012-07-16 13:45:13 +02:00
a-brandt 601b10da66 changes for mac os x 2012-07-09 16:08:51 +02:00
Frank Celler dfbc224571 create log dir 2012-06-30 11:26:22 +02:00
Frank Celler 7c0c4e9c0b fixed installation paths 2012-06-30 11:14:25 +02:00
Frank Celler b0839ae8b1 fixed installtion paths 2012-06-30 11:12:06 +02:00
Frank Celler 27ba3fc0dc fixed installation paths 2012-06-30 10:59:39 +02:00
Frank Celler d69586beb0 fixed installation issures 2012-06-30 10:32:50 +02:00
Frank Celler 3b3e881c85 added homebrew file 2012-06-29 15:44:12 +02:00
a-brandt 7a109540a7 added missing "bin/" 2012-06-25 10:29:37 +02:00
a-brandt 381cea5272 updates for packetize 2012-06-21 15:40:37 +02:00
a-brandt 67a5a45e52 packetize changes for MacOSX 2012-06-21 14:16:03 +02:00
a-brandt d134b1d73e packetize updates 2012-06-21 12:50:02 +02:00
a-brandt 6bf21ef153 packetize updates 2012-06-21 11:31:11 +02:00
a-brandt cf389b9146 epm changes 2012-06-20 17:36:59 +02:00
a-brandt efb9c5b041 added a default configuration file 2012-06-20 16:57:22 +02:00
a-brandt 9f69bcd526 Added packetize.sh for epm 2012-06-20 16:53:10 +02:00
Frank Celler d7379b2508 renamed Avocado to Arango 2012-05-12 14:51:33 +02:00
Frank Celler 763e7aba98 renamed to Arango 2012-05-12 14:40:34 +02:00
Frank Celler 29380360b4 added a Portfile 2012-02-22 16:34:48 +01:00
Frank Celler f3f4b16518 added user and group info 2012-02-22 16:27:51 +01:00
Frank Celler a9e0bcf17e use localhost under MacOS 2012-02-22 16:12:16 +01:00
Frank Celler c914882a7f added conf file 2012-02-22 13:24:14 +01:00
Frank Celler 17b333ffbf added installation for MacPorts 2012-02-20 18:02:30 +01:00