diff --git a/.mention-bot b/.mention-bot index 1c9a214fd5..56be9ab9e6 100644 --- a/.mention-bot +++ b/.mention-bot @@ -1,5 +1,5 @@ { "skipTitle": "Merge forward", - "userBlacklist": [] + "userBlacklist": ["cvrebert", "markusgattol", "olliewalsh"] } diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5a0790aa56..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: python - -python: - - '2.6' - - '2.7' - -before_install: - - sudo apt-get update - - sudo apt-get install --fix-broken --ignore-missing -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" swig rabbitmq-server ruby python-apt mysql-server libmysqlclient-dev - - (git describe && git fetch --tags) || (git remote add upstream git://github.com/saltstack/salt.git && git fetch --tags upstream) - - pip install mock - - pip install --allow-external http://dl.dropbox.com/u/174789/m2crypto-0.20.1.tar.gz - - pip install --upgrade pep8 'pylint<=1.2.0' - - pip install --upgrade coveralls - - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2 ordereddict; fi" - - pip install git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting - -install: - - pip install -r requirements/zeromq.txt -r requirements/cloud.txt - - pip install --allow-all-external -r requirements/opt.txt - -before_script: - - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pylint --rcfile=.testing.pylintrc salt/ && echo 'Finished Pylint Check Cleanly' || echo 'Finished Pylint Check With Errors'" - - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pep8 --ignore=E501,E12 salt/ && echo 'Finished PEP-8 Check Cleanly' || echo 'Finished PEP-8 Check With Errors'" - -script: "sudo -E /home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/python setup.py test --runtests-opts='--run-destructive --sysinfo -v --coverage'" - -after_success: - - coveralls - -notifications: - irc: - channels: "irc.freenode.org#salt-devel" - on_success: change - on_failure: change \ No newline at end of file diff --git a/conf/master b/conf/master index 044aa23b6a..5f41d7ab92 100644 --- a/conf/master +++ b/conf/master @@ -362,6 +362,15 @@ # #token_expire_user_override: False +# Set to True to enable keeping the calculated user's auth list in the token +# file. This is disabled by default and the auth list is calculated or requested +# from the eauth driver each time. +#keep_acl_in_token: False + +# Auth subsystem module to use to get authorized access list for a user. By default it's +# the same module used for external authentication. +#eauth_acl_module: django + # Allow minions to push files to the master. This is disabled by default, for # security purposes. #file_recv: False diff --git a/doc/_themes/saltstack2/layout.html b/doc/_themes/saltstack2/layout.html index f092041fbf..293f5e39d1 100644 --- a/doc/_themes/saltstack2/layout.html +++ b/doc/_themes/saltstack2/layout.html @@ -164,6 +164,9 @@
+