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/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2017-03-01 13:54:53 +01:00
parent ec60cf817b d137dfcd7e
commit 30ebae3d06
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -71,8 +71,6 @@ v3.2.alpha1 (2017-02-05)
* more detailed stacktraces in Foxx apps * more detailed stacktraces in Foxx apps
* add support for Swagger tags in Foxx
v3.1.12 (XXXX-XX-XX) v3.1.12 (XXXX-XX-XX)
-------------------- --------------------
@ -233,6 +231,8 @@ shards.
* process.stdout.isTTY now returns `true` in arangosh and when running arangod with the `--console` flag * process.stdout.isTTY now returns `true` in arangosh and when running arangod with the `--console` flag
* add support for Swagger tags in Foxx
v3.1.9 (XXXX-XX-XX) v3.1.9 (XXXX-XX-XX)
------------------- -------------------

9
Documentation/Books/Makefile
View File

@ -428,7 +428,14 @@ build-dist-books:
fi; \ fi; \
make build-books DISPLAY="$${DISP}"; \ make build-books DISPLAY="$${DISP}"; \
mkdir -p ${OUTPUT_DIR} ; \ mkdir -p ${OUTPUT_DIR} ; \
( cd books; tar -czf ${OUTPUT_DIR}/ArangoDB-${newVersionNumber}.tar.gz ${ALLBOOKS} index.html; ); \ ( \
mv books ArangoDB-${newVersionNumber} ; \
if test -n "${COOKBOOK_DIR}" ; then \
cp -a ${COOKBOOK_DIR} ArangoDB-${newVersionNumber}/cookbook ; \
fi ; \
tar -czf ${OUTPUT_DIR}/ArangoDB-${newVersionNumber}.tar.gz ArangoDB-${newVersionNumber} ; \
mv ArangoDB-${newVersionNumber} books ; \
) ; \
for book in $(ALLBOOKS); do \ for book in $(ALLBOOKS); do \
make build-book-dist NAME=$${book} DISPLAY="$${DISP}" ; \ make build-book-dist NAME=$${book} DISPLAY="$${DISP}" ; \
done; \ done; \