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

[2016.3] Merge forward from 2015.8 to 2016.3 #34619

Merged
merged 19 commits into from
Jul 12, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #34619

merged 19 commits into from
Jul 12, 2016

Commits on Jul 7, 2016

  1. Accept ignore_epoch argument for salt.utils.compare_versions()

    @terminalmage
    terminalmage committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    07368fa View commit details
    Browse the repository at this point in the history

  2. Pass ignore_epoch to salt.utils.compare_versions()

    @terminalmage
    terminalmage committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    5b123b4 View commit details
    Browse the repository at this point in the history

  3. salt/modules/aptpkg.py: accept ignore_epoch argument

    @terminalmage
    terminalmage committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    4ee8e8f View commit details
    Browse the repository at this point in the history

  4. salt/modules/ebuild.py: accept ignore_epoch argument

    @terminalmage
    terminalmage committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    c5de8b8 View commit details
    Browse the repository at this point in the history

  5. salt/modules/rpm.py: accept ignore_epoch argument

    @terminalmage
    terminalmage committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    c279111 View commit details
    Browse the repository at this point in the history

  6. salt/modules/yumpkg.py: accept ignore_epoch argument

    @terminalmage
    terminalmage committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    5ae9463 View commit details
    Browse the repository at this point in the history

  7. salt/modules/zypper.py: accept ignore_epoch argument

    @terminalmage
    terminalmage committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    d0fec1b View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2016

  1. Handle cases where Docker Remote API returns an empty ExecutionDriver 

    Also fix some poorly-formatted RST in the docstring.
    @terminalmage
    terminalmage committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    dd5838e View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34545 from terminalmage/docker-exec-driver 

    Handle cases where Docker Remote API returns an empty ExecutionDriver
    Mike Place authored Jul 8, 2016
    Configuration menu
    Copy the full SHA
    e99befa View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#34531 from terminalmage/issue34397 

    Support ignore_epoch argument in version comparisons
    Mike Place authored Jul 8, 2016
    Configuration menu
    Copy the full SHA
    91e0656 View commit details
    Browse the repository at this point in the history

  4. Add a bunch of documentation on getting files from other environments (… 

    …saltstack#34560)

* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
    Erik Johnson authored and Nicole Thomas committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    ae38c87 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2016

  1. Gate docker unit test to check for docker (saltstack#34591) 

    * Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
    Justin Anderson authored and Nicole Thomas committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    7dd8035 View commit details
    Browse the repository at this point in the history

  2. Avoid circular imports when calling salt.utils functions (saltstack#3… 

    …4584)
    Nicole Thomas authored Jul 12, 2016
    Configuration menu
    Copy the full SHA
    2e10072 View commit details
    Browse the repository at this point in the history

  3. When sorting list actual_data, make it a list (saltstack#34590) 

    This at least impacts the `running` state when updating container
with no `volumes_from` to some.
    @oeuftete
    oeuftete authored and Nicole Thomas committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    12b579c View commit details
    Browse the repository at this point in the history

  4. Update github IP for ssh state integration tests (saltstack#34592)

    Justin Anderson authored and Nicole Thomas committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    57df38e View commit details
    Browse the repository at this point in the history

  5. Add support for edge case when Cmd and Entrypoint can't be blanked (s… 

    …altstack#34593)
    Nicole Thomas authored Jul 12, 2016
    Configuration menu
    Copy the full SHA
    b90ae40 View commit details
    Browse the repository at this point in the history

  6. Merge branch '2015.5' into '2015.8' 

    No conflicts.
    rallytime committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    3026df3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request saltstack#34617 from rallytime/merge-2015.8 

    [2015.8] Merge forward from 2015.5 to 2015.8
    Nicole Thomas authored Jul 12, 2016
    Configuration menu
    Copy the full SHA
    9f12354 View commit details
    Browse the repository at this point in the history

  8. Merge branch '2015.8' into '2016.3' 

    Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
    rallytime committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    f734afd View commit details
    Browse the repository at this point in the history