diff --git a/CHANGELOG b/CHANGELOG index 045cdfac69..5ec8cd2015 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -v1.4.0-alpha1 (2013-08-02) +v1.4.0-alpha2 (2013-09-05) -------------------------- * introduced `--server.database` option for arangosh, arangoimp, and arangob. diff --git a/Documentation/Makefile.files b/Documentation/Makefile.files index bc01c535ad..0cc24a9b58 100644 --- a/Documentation/Makefile.files +++ b/Documentation/Makefile.files @@ -162,7 +162,6 @@ DOXYGEN = \ Doxygen/js/server/modules/org/arangodb/arango-collection.c \ Doxygen/js/server/modules/org/arangodb/arango-database.c \ Doxygen/js/server/modules/org/arangodb/foxx.c \ - Doxygen/js/server/modules/org/arangodb/foxx/application.c \ Doxygen/js/server/modules/org/arangodb/foxx/authentication.c \ Doxygen/js/server/modules/org/arangodb/foxx/base_middleware.c \ Doxygen/js/server/modules/org/arangodb/foxx/controller.c \ diff --git a/Installation/release.sh b/Installation/release.sh index 8a41d4f904..037276ba2c 100755 --- a/Installation/release.sh +++ b/Installation/release.sh @@ -43,7 +43,6 @@ make add-maintainer || exit 1 make add-automagic || exit 1 make doxygen || exit 1 make latex || exit 1 -make wiki || exit 1 if [ "$TAG" == "1" ]; then git commit -m "release version $VERSION" -a diff --git a/Makefile.in b/Makefile.in index bce1b2dfea..3ebbd9688e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1960,7 +1960,6 @@ DOXYGEN = \ Doxygen/js/server/modules/org/arangodb/arango-collection.c \ Doxygen/js/server/modules/org/arangodb/arango-database.c \ Doxygen/js/server/modules/org/arangodb/foxx.c \ - Doxygen/js/server/modules/org/arangodb/foxx/application.c \ Doxygen/js/server/modules/org/arangodb/foxx/authentication.c \ Doxygen/js/server/modules/org/arangodb/foxx/base_middleware.c \ Doxygen/js/server/modules/org/arangodb/foxx/controller.c \ diff --git a/VERSION b/VERSION index f5eea88548..ac56608432 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0-alpha1 +1.4.0-alpha2 diff --git a/build.h b/build.h index aca4fc1493..d62089804c 100644 --- a/build.h +++ b/build.h @@ -1 +1 @@ -#define TRI_VERSION "1.4.0-alpha1" +#define TRI_VERSION "1.4.0-alpha2" diff --git a/configure b/configure index d386233490..71b6b78988 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for triAGENS ArangoDB 1.4.0-alpha1. +# Generated by GNU Autoconf 2.69 for triAGENS ArangoDB 1.4.0-alpha2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='triAGENS ArangoDB' PACKAGE_TARNAME='arangodb' -PACKAGE_VERSION='1.4.0-alpha1' -PACKAGE_STRING='triAGENS ArangoDB 1.4.0-alpha1' +PACKAGE_VERSION='1.4.0-alpha2' +PACKAGE_STRING='triAGENS ArangoDB 1.4.0-alpha2' PACKAGE_BUGREPORT='info@triagens.de' PACKAGE_URL='http://www.arangodb.org' @@ -1401,7 +1401,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures triAGENS ArangoDB 1.4.0-alpha1 to adapt to many kinds of systems. +\`configure' configures triAGENS ArangoDB 1.4.0-alpha2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1472,7 +1472,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of triAGENS ArangoDB 1.4.0-alpha1:";; + short | recursive ) echo "Configuration of triAGENS ArangoDB 1.4.0-alpha2:";; esac cat <<\_ACEOF @@ -1603,7 +1603,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -triAGENS ArangoDB configure 1.4.0-alpha1 +triAGENS ArangoDB configure 1.4.0-alpha2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2068,7 +2068,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by triAGENS ArangoDB $as_me 1.4.0-alpha1, which was +It was created by triAGENS ArangoDB $as_me 1.4.0-alpha2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3256,7 +3256,7 @@ fi # Define the identity of the package. PACKAGE='arangodb' - VERSION='1.4.0-alpha1' + VERSION='1.4.0-alpha2' cat >>confdefs.h <<_ACEOF @@ -9113,7 +9113,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by triAGENS ArangoDB $as_me 1.4.0-alpha1, which was +This file was extended by triAGENS ArangoDB $as_me 1.4.0-alpha2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9180,7 +9180,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -triAGENS ArangoDB config.status 1.4.0-alpha1 +triAGENS ArangoDB config.status 1.4.0-alpha2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ddccb9eae3..68189e7746 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl ============================================================================ dnl --SECTION-- triAGENS GmbH Build Environment dnl ============================================================================ -AC_INIT([triAGENS ArangoDB], [1.4.0-alpha1], [info@triagens.de], [arangodb], [http://www.arangodb.org]) +AC_INIT([triAGENS ArangoDB], [1.4.0-alpha2], [info@triagens.de], [arangodb], [http://www.arangodb.org]) dnl ---------------------------------------------------------------------------- dnl auxillary directory for install-sh and missing