Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2015.5] Merge forward from 2014.7 to 2015.5 #27176

Merged
merged 7 commits into from Sep 17, 2015
Merged

[2015.5] Merge forward from 2014.7 to 2015.5 #27176

merged 7 commits into from Sep 17, 2015

Commits on Sep 11, 2015

  1. Replaced password with redacted when displayed

    @twangboy
    twangboy committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    c0689e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2015

  1. Merge pull request saltstack#27075 from twangboy/fix_password_2014.7 

    Replaced password with redacted when displayed
    Mike Place committed Sep 14, 2015
    Configuration menu
    Copy the full SHA
    aa71bae View commit details
    Browse the repository at this point in the history

  2. Issue warning that some log levels may contain sensitive data

    Mike Place committed Sep 14, 2015
    Configuration menu
    Copy the full SHA
    507fb04 View commit details
    Browse the repository at this point in the history

  3. made 2014.7 an archived release 

    minor doc site updates
    @jacobhammons
    jacobhammons committed Sep 14, 2015
    Configuration menu
    Copy the full SHA
    b69e11e View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2015

  1. Merge pull request saltstack#27114 from cachedout/warn_on_insecure_log 

    Issue warning that some log levels may contain sensitive data
    @jfindlay
    jfindlay committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    69d758e View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#27117 from jacobhammons/release-docs-2014.7 

    made 2014.7 an archived release
    @jfindlay
    jfindlay committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    c186e51 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 

    Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
    @basepi
    basepi committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    66f4641 View commit details
    Browse the repository at this point in the history