Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Heiko Kernbach 2013-02-15 13:40:09 +01:00
parent e7250325cb a41ccc4d7e
commit b80a9369db
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -60,6 +60,7 @@ arangod/Ahuacatl/ahuacatl-grammar.h
arangod/Ahuacatl/ahuacatl-grammar.output arangod/Ahuacatl/ahuacatl-grammar.output
arangod/Ahuacatl/ahuacatl-tokens.c arangod/Ahuacatl/ahuacatl-tokens.c
bin/ bin/
etc/arangodb/arangod-nouid.conf
etc/arangodb/arangod.conf etc/arangodb/arangod.conf
etc/arangodb/arangoirb.conf etc/arangodb/arangoirb.conf
etc/arangodb/arangosh.conf etc/arangodb/arangosh.conf

5
Makefile.am
View File

@ -72,6 +72,11 @@ TRI_SBINDIR = ${sbindir}
endif endif
BUILT_SOURCES += etc/arangodb/arangod-nouid.conf
etc/arangodb/arangod-nouid.conf: @srcdir@/etc/arangodb/arangod.conf
grep -v '^\(uid\|gid\)' $< > $@
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- FLAGS ## --SECTION-- FLAGS
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------