============================ Salt 2016.11.2 Release Notes

Version 2016.11.2 is a bugfix release for :ref:2016.11.0 <release-2016-11-0>.

Statistics

Total Merges: 157
Total Issue References: 34
Total PR References: 116
Contributors: 45 (Ch3LL, Cybolic, DmitryKuzmenko, UtahDave, Vaelatern, alex-zel, alxwr, amendlik, anlutro, aosagie, basdusee, bbinet, benediktwerner, cachedout, clinta, cro, dereckson, disaster123, ewapptus, ezh, folti, gmacon, gqgunhed, gtmanfred, kkoppel, lorengordon, martintamare, mcalmer, meaksh, mirceaulinic, mostafahussein, mvdwalle, rallytime, rbjorklin, scthi, sjorge, techhat, terminalmage, tsaridas, twangboy, vutny, wolfpackmars2, yhekma, yopito, yue9944882_)

Security Fixes

CVE-2017-5192 local_batch client external authentication not respected

The LocalClient.cmd_batch() method client does not accept external_auth credentials and so access to it from salt-api has been removed for now. This vulnerability allows code execution for already-authenticated users and is only in effect when running salt-api as the root user.

CVE-2017-5200 Salt-api allows arbitrary command execution on a salt-master via Salt's ssh_client

Users of Salt-API and salt-ssh could execute a command on the salt master via a hole when both systems were enabled.

We recommend everyone upgrade to 2016.11.2 as soon as possible.

Changelog for v2016.11.1..v2016.11.2

Generated at: 2018-05-27 19:28:11 UTC

PR #38859: (alxwr) fix parsing of sockstat -4 @ 2017-01-23 16:47:22 UTC
- ec59ae67c8 Merge pull request #38859_ from alxwr/2016.11
- 30fe5641c7 fix parsing of sockstat -4
PR #38850: (techhat) Strip .p from cache file names @ 2017-01-23 16:28:46 UTC
- 5fe6db6201 Merge pull request #38850_ from techhat/stripcache
- 109cb62e76 Remove .p from test
- 534aa3f527 Strip .p from cache file names
- PR #38848: (Ch3LL) add 2016.11.2 changelog to release notes
PR #38819: (twangboy) Remove Users from c:\salt [DO NOT MERGE FORWARD] @ 2017-01-20 20:17:35 UTC
- 4913c4f90c Merge pull request #38819_ from twangboy/salt_perms_2016.11
- eb04ed7eef Remove User from c:\salt
PR #38815: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2017-01-20 18:53:01 UTC
- a275b9714e Merge pull request #38815_ from rallytime/merge-2016.11
- ce6d1b103d Make sure we're using the opts dict mocking in parsers_test
- 315b2c8712 Merge branch '2016.3' into '2016.11'
  - d14f0c64eb Merge pull request #38812_ from rallytime/pyobjects-test
    - f3e84c1ab7 Update pyobjects test to be a list
  - 50f03f8057 Merge pull request #38813_ from gtmanfred/2016.3
    - ce3472cec2 catch SIGPIPE in vmware connection
  - 23b8b47258 Merge pull request #38809_ from twangboy/fix_hostname_2016.3
    - d57a51f9f9 Fix tests for get_hostname
    - 7ca3fd7484 Fix get_hostname to handle longer computer names
  - 1033bbdde8 Merge pull request #38808_ from vutny/fix-38388
    - 9bd203ffcc Fix #38388_
  - f3ae3cd5c8 Merge pull request #38668_ from terminalmage/issue38604
    - 0ea97cdad9 Merge pull request #10_ from cachedout/pr-38668
      - db81afc035 Munge retcode into return data for batching
    - a642a995dc Return the ret data from batch execution instead of raw data
  - c6a19a9e5a Merge pull request #38789_ from rallytime/fix-38622
    - af41fe0c6e Update some saltenv refs to environment in salt.modules.state docs
  - e0bf700020 Merge pull request #38790_ from cachedout/fix_pyobjects_test_typo
    - a66afb5f0f Fix typo in pyobjects test
  - 6e9785edea Merge pull request #38792_ from rallytime/fix-38629
    - 1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings
PR #38832: (terminalmage) archive.extracted: Identify symlinks when checking for incorrect types @ 2017-01-20 18:36:15 UTC
- efe1bf10e8 Merge pull request #38832_ from terminalmage/issue38711
- d10c068e25 Update archive state unit tests to reflect symlinks in archive.list
- d6adfb6d12 Identify symlinks when looking for incorrect types
- 09b9e95f7c archive.list: organize symlinks separately from files in verbose mode
- e6483f096d Support removing symlinks in salt.utils.rm_rf
PR #38726: (twangboy) Add VC Redist 2008 SP1 MFC to installer @ 2017-01-19 19:13:42 UTC
- 10a3d8b8dd Merge pull request #38726_ from twangboy/vcredist
- f00a65355d change extensions .ext to .exe
- 98c40e278c Add VC Redist 2008 SP1 MFC to installer
PR #38810: (UtahDave) Fix beacon doc @ 2017-01-18 21:37:21 UTC
- d5f2d92a4e Merge pull request #38810_ from UtahDave/fix_beacon_doc_zd1035
- dbe9edb806 fix reactor example.
PR #38811: (techhat) Show a lot less data when requesting a VM @ 2017-01-18 21:08:03 UTC
- 88faf08a71 Merge pull request #38811_ from techhat/sanvm
- 47c19325cf Show a lot less data when requesting a VM
- PR #38807: (Ch3LL) refine the os detection in archive test
PR #38799: (aosagie) Parse ansible dynamic inventory output correctly @ 2017-01-18 15:32:47 UTC
- e3ca6881c8 Merge pull request #38799_ from aosagie/fix-ansible-dynamic-roster
- 26d6f699a7 Parse ansible dynamic inventory output correctly
PR #38787: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2017-01-18 08:39:08 UTC
- 76df6a43f3 Merge pull request #38787_ from rallytime/merge-2016.11
- 2aad54c49f Merge branch '2016.3' into '2016.11'
  - 3417adc617 Merge pull request #38796_ from saltstack/revert-38707-root_dir_fix-gh
    - cb080f3bbe Revert "Fixed prepending of root_dir override to the other paths"
- 64d866f7ab Merge branch '2016.3' into '2016.11'
- bab3479a3c Merge pull request #38585_ from rallytime/follow-up-38527
  - 05587201b6 Pylint fix: add line at end of file
  - fa01367599 Keep a copy of the DEFAULT_API_OPTS and restore them after the test run
  - 2ad07634d9 Test clean up
  - fd2ee7db30 Add some simple unit tests for salt.config.api_config function
  - 3d2fefc83b Make sure the pidfile and log_file values are overridden by api opts
  - 1f6b540e46 Make sure the pidfile and log_file values are overridden by api opts
  - 04d307f917 salt-api no longer forces the default timeout
- 0fb6bb7b77 Merge pull request #38707_ from alexbleotu/root_dir_fix-gh
  - 0bac8c8be3 Fixed prepending of root_dir override to the other paths
- 96c9dc10f7 Merge pull request #38774_ from vutny/dev-test-docs
  - 4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq
- aedfbb7a43 Merge pull request #38749_ from vutny/pkg-build-better-exception-msg
  - 53f2be5b21 pkg build modules throw better exception message if keyid wasn't found
PR #38660: (techhat) Don't force salt.cache to use cachedir from opts @ 2017-01-17 18:38:35 UTC
- 4e6146f65f Merge pull request #38660_ from techhat/cachedir
- be55b57abf One last fix
- fc24b24998 Add correct function name
- 9bbecf7960 Typo fix
- 436ba28f08 Change getlist back to list (using _list)
- ff734fe93b Default to CACHE_DIR in syspaths
- 380abd3744 Add cachedir args to tests
- deb08c0587 Not every module will need cachedir
- 4489f7cac0 Don't force salt.cache to use cachedir from opts
ISSUE #37948: (djacobs2016) ssh_known_hosts.present is failing when checking key/host (refs: #37982_)
ISSUE #33932: (folti) ssh_known_hosts.present: hashing global known hosts file makes it readable by root only (refs: #33933_)
PR #38667: (rallytime) Back-port #37982_ to 2016.11 @ 2017-01-17 15:42:13 UTC
- PR #37982: (wolfpackmars2) Update ssh.py (refs: #38667_)
- PR #33933: (folti) ssh: keep original permissions, when hashing known_hosts (refs: #38667_)
- 89dc86e2bc Merge pull request #38667_ from rallytime/bp-37982
- be91e46a93 Update ssh.py
PR #38759: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2017-01-17 15:22:01 UTC
- 751e14c523 Merge pull request #38759_ from rallytime/merge-2016.11
- 30e8a66fb0 Merge branch '2016.3' into '2016.11'
  - 8466b34e82 Merge pull request #38743_ from rallytime/merge-2016.3
    - d24776f5e9 Merge branch '2015.8' into '2016.3'
    - 6869621ed1 Merge pull request #38731_ from rallytime/merge-2015.8
      - 9eb191b6ac Pylint fix
      - b910499dbe Various follow up fixes
      - e8309a6bbf Add release notes for 2015.8.13
      - f881f366b7 Merge pull request #20_ from rallytime/2015.8.12_follow_up-batch-tests
        
        34282322c0 Clean up tests and docs for batch execution
      - c80b20b957 Merge pull request #19_ from whiteinge/batchclient
        
        3d8f3d18f6 Remove batch execution from NetapiClient and Saltnado
      - 97b0f64923 Lintfix
      - d1516664f7 Add explanation comment
      - 62f2c87080 Add docstring
      - 9b0a786aeb Explain what it is about and how to configure that
      - 5ea3579e10 Pick up a specified roster file from the configured locations
      - 3a8614c5df Disable custom rosters in API
      - c0e5a1171d Add roster disable flag
    - e9c59e9b8f Merge pull request #38602_ from terminalmage/fix-boto-test
    - 3424a108ac Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes
  - a642cdef79 Merge pull request #38723_ from rallytime/fix-38674
    - 706c885f55 Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/init.py
  - fc545af10b Merge pull request #38669_ from rallytime/update-bootstrap-script
    - 78ba76e34c Update bootstrap script verstion to latest release
  - 50d417f267 Merge pull request #38693_ from twangboy/update_jinja
    - e0c7e5549b Update jinja2 to 2.9.4
  - f4233bb18d Merge pull request #38739_ from vutny/fix-runtests-doc
    - b872bb63f6 DOCS: correct examples of running test suite
  - 51d4707071 DOCS: add links to File State Backups page where necessary (#38735_)
  - 6d3717b9ee Proofread jinja_to_execution_module tutorial (#38720_)
ISSUE #38775: (charburns) Error using napalm netusers (refs: #38778_)
PR #38778: (mirceaulinic) Fix "Error using napalm netusers" @ 2017-01-17 15:20:27 UTC
- bb6291d93a Merge pull request #38778_ from cloudflare/fix-38775
- b3388f7162 Fix #38775_
ISSUE #38528: (MorphBonehunter) x509 make permissions configurable (refs: #38664_)
ISSUE #38081: (haraldrudell) x509 state or module cannot generate password protected private keys (refs: #38664_)
PR #38664: (clinta) X509 Improvements. Expose setting permissions, encrypted private keys, and combined key and cert management in one state @ 2017-01-17 02:20:18 UTC
- 6663107021 Merge pull request #38664_ from clinta/x509-passphrase2
- 77c78723fe pep8
- a2b20ee518 No mutable default args, remove unneeded import
- b48b85cc70 bug fixes
- f62393b864 pep8
- c8613243a1 change documentation
- 9a0abde9ac expose passphrase functionality to state
- e47a93d496 add passphrase to execution module
- a4d6598f1e preserve detailed change reports
- d0ad251778 combine private key and cert management
- 3d1474d911 cross call file.managed to get permissions options
PR #38682: (mirceaulinic) [2016.11.2/napalm] Better error message when NotImplementedError raised @ 2017-01-15 18:34:25 UTC
- bf6d74c98e Merge pull request #38682_ from cloudflare/NotImplementedError-MSG
- f847639dee Better error message when NotImplementedError raised
ISSUE #37996: (stefan-as) influxdb_user.present does not pass client_args (refs: #38695_)
PR #38695: (rallytime) Pass in client_args when calling influxdb execution module funcs @ 2017-01-15 18:33:48 UTC
- df12e49d80 Merge pull request #38695_ from rallytime/fix-37996
- 05b0975888 Pass in client_args when calling influxdb execution module funcs
ISSUE #38521: (vladvasiliu) State cloud.present on AWS: TypeError: 'NoneType' object is not iterable (refs: #38651_)
ISSUE #37981: (tazaki) Salt-cloud ec2 vpc securitygroupid always returning default (refs: #38183_)
PR #38651: (rallytime) Don't lose the set reference for ec2 securitygroup ids @ 2017-01-15 18:06:25 UTC
- PR #38183: (cro) Fix bad set operations when setting up securitygroups in AWS. (refs: #38651_)
- 834e5469fc Merge pull request #38651_ from rallytime/fix-38521
- 830c03cec6 Don't lose the set reference for ec2 securitygroup ids
ISSUE #38216: (pgrishin) salt-run: can't get cache.grains (refs: #38659_)
PR #38659: (techhat) Turn None into an empty string (for minion matching) @ 2017-01-15 18:02:03 UTC
- 8b38cfea8d Merge pull request #38659_ from techhat/issue38216
- 4073c91584 Turn None into an empty string (for minion matching)
PR #38703: (yhekma) The test option is only valid for the minion, not the master @ 2017-01-15 17:56:22 UTC
- 0ad5d22ad4 Merge pull request #38703_ from yhekma/docfix
- 57df3bf148 The test option is only valid for the minion, not the master
PR #38718: (terminalmage) Fix for dynamic git_pillar when pillarenv is used @ 2017-01-15 14:37:30 UTC
- 8c1222e7db Merge pull request #38718_ from terminalmage/zd909
- 12bbea5a24 Fix for dynamic git_pillar when pillarenv is used
ISSUE #38677: (yhekma) consul cache backend broken (refs: #38676_)
PR #38676: (yhekma) Removed overloading of list() @ 2017-01-15 05:42:13 UTC
- aae8b54860 Merge pull request #38676_ from yhekma/2016.11
- 3237d23e1c Localfs should also be changed of course
- 9d9de67219 We do not want to overload the list() type because if we do, we turn this function into a recursive one, which results in an exception because set() cannot be concatenated with str ('/')
ISSUE #38684: (rukender) 2016.11.1 :[ERROR][11182] Failed to import beacons avahi_announce (refs: #38713_)
PR #38713: (rallytime) Add NameError to exception in avahi_announce beacon @ 2017-01-15 05:33:04 UTC
- c246ab41c5 Merge pull request #38713_ from rallytime/fix-38684
- db60bed24c Add NameError to exception in avahi_announce beacon
PR #38729: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2017-01-13 23:15:33 UTC
- 6c14774c04 Merge pull request #38729_ from rallytime/merge-2016.11
- 4e1e45d640 Merge branch '2016.3' into '2016.11'
- 7b850d472d Merge pull request #38647_ from gtmanfred/nova
  - 5be9b60851 add documentation about using keystoneauth for v3
  - 7b657ca4ae add the ability to use keystone v2 and v3
  - 5646ae1b34 add ability to use keystoneauth to authenticate in nova driver
- 383768d838 Merge pull request #38650_ from rallytime/remove-ubuntu-ppa-docs
  - 30429b2e44 Remove the installation instructions for out-of-date community ppa
- 7d9f56e3b5 Merge pull request #38657_ from DSRCorporation/bugs/38087_syndic_event_format_fix
  - 594c33f396 Publish the 'data' field content for Syndic evets
- 83987511fd Merge pull request #38649_ from Ch3LL/test_apply_template
  - 47f8b68e0b fix unit.modules.file_test
ISSUE #38631: (doitian) In Orchestration, kwargs are not passed to state.sls in masterless mode (refs: #38635_)
PR #38635: (lorengordon) Sends pass-through params to state module @ 2017-01-10 20:01:59 UTC
- cfd82d1631 Merge pull request #38635_ from lorengordon/issue-38631
- 14666138b9 Sends pass-through params to state module
PR #38640: (mirceaulinic) Import napalm_base instead of napalm @ 2017-01-10 19:58:01 UTC
- 017094a207 Merge pull request #38640_ from cloudflare/NAPALM-IMPORTS
- 8f13f63880 Import napalm_base instead of napalm
PR #38661: (techhat) Add sane cache defaults for minion and cloud @ 2017-01-10 19:55:15 UTC
- 79663132dd Merge pull request #38661_ from techhat/sanedefault
- aee40648ec Add a sane cache default for cloud
- c9e01a36e7 Add a sane cache default for minions
PR #38645: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2017-01-10 19:54:06 UTC
- b0ed91ce2d Merge pull request #38645_ from rallytime/merge-2016.11
- 7a668e9749 Merge branch '2016.3' into '2016.11'
- 74ddc71be3 Merge pull request #38626_ from saltstack/revert-37358-2016.3.3_issue37355
  - e912ac99c2 Revert "Fix/workaround for issue #37355_"
- 5e58b32934 Merge pull request #37358_ from Firewire2002/2016.3.3_issue37355
  - 910da18bfd fixed typo
  - 4fbc5ddd06 fixed wrong renamed variable and spaces
  - 92366e646c issue #37355_
  - 7dc87ab7b8 issue #37355_
  - 2878180405 issue #37355_
- 6c2fe615aa Merge pull request #35390_ from alexandr-orlov/2016.3
  - cd5ae17e8d fxd missed proper grains dictionary
- 2579cfa42d Merge pull request #38618_ from rallytime/bp-38579
  - 2052ecee2c Add copy import
  - 2c8845aaa0 add test for pillar.get() + default value
  - c2f98d2f04 ticket 38558: add unit test, deepcopy() only if necessary
  - 30ae0a1958 added deepcopy of default if merge=True
PR #38627: (cachedout) Pr 38476 @ 2017-01-06 22:05:45 UTC
- PR #38476: (amendlik) Key fingerprints (refs: #38627_)
- d67f6937d7 Merge pull request #38627_ from cachedout/pr-38476
- 2a423ffedd Add changes to raetkey
- 55ad9d6c6c Add hash_type argument to MultiKeyCLI.finger_all function
- c8681269a4 Add hash_type argument to key module fingerprint functions
- d0f4c300b7 Add hash_type argument to wheel fingerprint functions
- e558ddcb18 Add finger_master function to wheel.key module
ISSUE #38595: (yue9944882) Redis ext job cache occurred error (refs: #38610_)
PR #38610: (yue9944882) Fix #38595_ - Unexpected error log from redis retuner in master's log @ 2017-01-06 21:47:21 UTC
- b13cd1370f Merge pull request #38610_ from yue9944882/2016.11
- 54325cf293 Fix #38595_ - Unexpected error log from redis retuner in master's log
ISSUE #36148: (alex-zel) Eauth error with openLDAP groups (refs: #38406_)
PR #38406: (alex-zel) Fix eauth error with openLDAP/389 directory server groups @ 2017-01-06 21:40:30 UTC
- 179d385003 Merge pull request #38406_ from alex-zel/fix-eauth-groups-permissions
- 6b9e9d8f89 Fix eauth error with openLDAP/389 directory server groups
PR #38619: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2017-01-06 17:51:19 UTC
- 82e9b3d1a1 Merge pull request #38619_ from rallytime/merge-2016.11
- 0efb2d844e Merge branch '2016.3' into '2016.11'
  - da676cebd6 Merge pull request #38601_ from terminalmage/pillar-get
    - 8613d7254d pillar.get: Raise exception when merge=True and default is not a dict
  - 224fc7712a Merge pull request #38600_ from terminalmage/issue38459-2016.3
    - 8a45b13e76 Avoid errors when sudo_user is set
  - a376970f88 Merge pull request #38589_ from tobithiel/fix_rvm_rbenv_warning
    - 9ec470b4a5 State Gem: fix incorrect warning about missing rvm/rbenv
  - 02e6a78254 Merge pull request #38567_ from pass-by-value/pgjsonb_queue_changes_2016.3
    - 67879ebe65 Create queue if one doesn't exist
  - 0889cbdb31 Merge pull request #38587_ from rallytime/fix-37498
    - 2a5880966f Change daemontools virtualname from service to daemontools
PR #38612: (sjorge) network.ifacestartswith throws exception on Solaris-like platforms @ 2017-01-06 17:20:32 UTC
- f64e003a69 Merge pull request #38612_ from sjorge/2016.11-solaris-ifacestartswith
- 26fae54f5b network.ifacestartswith throws exception on Solaris-like platforms
ISSUE #37027: (sjorge) Solaris FQDN/UQDN and documentation/consistency (refs: #38615_)
PR #38615: (sjorge) add note related to issue #37027_ @ 2017-01-06 16:38:34 UTC
- 5820ceee16 Merge pull request #38615_ from sjorge/2016.11-solarisdocs
- fbdd32f46b add note related to issue #37027_
PR #38598: (terminalmage) Avoid errors when sudo_user is set (refs: #38600, #38599) @ 2017-01-05 23:16:22 UTC
- a27fdb46a7 Merge pull request #38598_ from terminalmage/issue38459
- b37f7ffa38 Avoid errors when sudo_user is set
PR #38599: (terminalmage) archive.extracted: Prevent traceback when state.single cannot be run @ 2017-01-05 23:16:11 UTC
- PR #38598: (terminalmage) Avoid errors when sudo_user is set (refs: #38600, #38599)
- d6b7019df6 Merge pull request #38599_ from terminalmage/archive-results-handling
- 9aceb8186d archive.extracted: Prevent traceback when state.single cannot be run
ISSUE #38517: (basdusee) Slack.py engine 100% CPU load due to missing time.sleep(1) (refs: #38520_)
PR #38520: (basdusee) Fix issue #38517_, added time.sleep(1) at line 227 in slack.py @ 2017-01-05 20:35:08 UTC
- d486b42ceb Merge pull request #38520_ from basdusee/fix-issue-38517
- e3a883c915 Small fix on the fix regarding indentation
- 8adeae6f81 Fix issue #38517_, added time.sleep(1) at line 227 in slack.py engine.
ISSUE #38485: (wasabi222) bgp.config not working (refs: #38499_)
PR #38577: (mirceaulinic) Fix function headers as per #38499_ @ 2017-01-05 18:41:33 UTC
- PR #38499: (mirceaulinic) Fix #38485_ (refs: #38577_)
- 0706cde626 Merge pull request #38577_ from cloudflare/PREP-2016.11.2
- 62bee3c793 Fix function headers as per #38499_
PR #38578: (mirceaulinic) [2016.11] Port 5123f11 from develop into 2016.11.2 @ 2017-01-05 18:11:12 UTC
- 55d1747792 Merge pull request #38578_ from cloudflare/PORT-5123f1
- dea7866d57 Update net.load_template doc: 2016.11.2
ISSUE #38462: (g-shockfx) Cant add beacon memusage on Windows (refs: #38584`_)
PR #38584: (rallytime) Allow memusage beacon to load on Windows @ 2017-01-05 18:08:30 UTC
- be69bafe6e Merge pull request #38584_ from rallytime/fix-38462
- 1fe945df5e Allow memusage beacon to load on Windows
PR #38570: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 (refs: #38585_) @ 2017-01-05 14:28:38 UTC
- 14b643fd48 Merge pull request #38570_ from rallytime/merge-2016.11
- 30f14d15df Merge branch '2016.3' into '2016.11'
- 7b74436d13 Merge pull request #38562_ from rallytime/arch-install-docs
  - 8b1897ace9 Update arch installation docs with correct package name
- 01860702cb Merge pull request #38560_ from Ch3LL/fix_api_log
  - 1b45e9670b fix api logfile
- 0056620a53 Merge pull request #38531_ from rallytime/bp-33601
  - c36cb39825 remove the unnecessary double trigger
  - 38414493bf fix spacing lint error
  - 8c1defc710 Remove uncessary type from alias commands. Deduplicate alias handling to autodetect function selection. Add error reporting to slack connectivty problems. Cleanup slack's unicode conversion
  - c2f23bc45e Fix slack engine to run on python2.6
- 50242c7f17 Merge pull request #38541_ from techhat/issue38187
  - eae3a435dd Strip user:pass from cached URLs
- 325dc56e59 Merge pull request #38554_ from multani/fix/30454
  - 2e7f743371 yaml: support unicode serialization/deserialization
  - df76113c5c jinja: test the "yaml" filter with ordered dicts
  - f7712d417f Revert "Add yaml_safe filter"
- 4ddbc2ecaa add note about pyVmomi locale workaround (#38536_)
- 1c951d152b fix gce image bug (#38542_)
PR #38509: (mostafahussein) Stop request from being processed if bad ip @ 2017-01-04 20:05:44 UTC
- 9a1550d336 Merge pull request #38509_ from mostafahussein/2016.11
- 8847289c3e remove commented code
- 420817a963 Stop request from being processed if bad ip
ISSUE #38518: (kkoppel) slack_notify.call_hook returns tracebacks (refs: #38522_)
PR #38522: (kkoppel) Fix usage of salt.utils.http.query in slack_notify.call_hook @ 2017-01-04 20:04:57 UTC
- bc07d420e9 Merge pull request #38522_ from kkoppel/fix-issue-38518
- ff1e7f0c71 Fix usage of salt.utils.http.query in slack_notify.call_hook
ISSUE #38524: (rbjorklin) salt-api seems to ignore rest_timeout since 2016.11.0 (refs: #38585, #38527)
PR #38527: (rbjorklin) salt-api no longer forces the default timeout (refs: #38585_) @ 2017-01-04 17:10:15 UTC
- 42fef270ee Merge pull request #38527_ from rbjorklin/api-timeout-fix
- 0202f68820 salt-api no longer forces the default timeout
PR #38529: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2017-01-04 17:06:57 UTC
- 1895eb7533 Merge pull request #38529_ from rallytime/merge-2016.11
- 85f470207c Merge branch '2016.3' into '2016.11'
  - ec60f9c721 Merge pull request #38487_ from gtmanfred/2016.3
    - 048b9f6b9d add test
    - c480c11528 allow spaces in cron env
    - c529ec8c34 allow crons to have multiple spaces
  - c5ba11b5e0 Merge pull request #38491_ from gtmanfred/timing
    - 79368c7528 Use UTC for timing in case timezone changes
  - 86f0aa0bb3 Merge pull request #38503_ from jinm/issue_38472_jinm
    - 0cd9df299f Hash type fallback for file management
  - ed2ba4bd1b Merge pull request #38457_ from bshelton229/git-latest-head-bug
    - 558e7a771a Stops git.latest checking for local changes in a bare repo
  - 36e21b22cb Merge pull request #38385_ from dragon788/2016.3-double-dash
    - 86c4b56f47 Newline for lint compat
    - 9d9b686057 Address review comments, consistency of quotes
    - df9bd5e7f9 Use unambigous long names with double dashes
  - 59f2560d88 Merge pull request #38474_ from cachedout/key_loop
    - de504538e1 Allow an existing ioloop to be passed to salt-key
  - 3d0c752acd Merge pull request #38467_ from gtmanfred/2016.3
    - 7b7c6b3878 file.line fail with mode=delete
  - 940025d5c4 Merge pull request #38434_ from slinn0/issue_38433_fixes
    - 22af87a3fc Fixes for https://github.com/saltstack/salt/issues/38433
  - e5eb51255b Update deprecation notices to the correct version (#38421_)
  - 9ce53318df file.managed: Fix failure when filename contains unicode chars (#38415_)
  - 2cdb59d055 Merge pull request #38419_ from Ch3LL/fix_doc_scsi
    - 234043b8bb fix scsci docs example
PR #38539: (twangboy) Fix DSC LCM Config int checks @ 2017-01-04 16:56:27 UTC
- ec4f118ca2 Merge pull request #38539_ from twangboy/dsc_int_checks
- 5657fd1956 Add repr flag for str
- aea4219502 Fix DSC LCM Config int checks
PR #38549: (meaksh) Adding multiple SUBVOLUME support and some fixes to the Snapper module @ 2017-01-04 15:32:30 UTC
- 53449c89a5 Merge pull request #38549_ from meaksh/2016.11-snapper-multiple-subvolumen-support
- ef26e93bb7 Some fixes and pylint
- 1e6ba45db4 Fixes pre/post snapshot order to get the inverse status
- 68d5475c1f Fixing Snapper unit tests for SUBVOLUME support
- e9919a913f Removing possible double '/' from the file paths
- 8b4f87f226 Updating and fixing the documentation
- edea45272a Raises "CommandExecutionError" if snapper command fails
- 3841e1143b Only include diff in the state response if include_diff is True
- 7803e7716c Adds multiple SUBVOLUME support to the Snapper module
- PR #38545: (rallytime) Move boto_vpc.describe_route_table deprecation version to Oxygen
PR #38471: (twangboy) Fix Problem with win_service module @ 2017-01-01 20:30:21 UTC
- 5e80104a70 Merge pull request #38471_ from twangboy/fix_win_service
- 810471b9cd Fix problem with some services getting access denied
ISSUE #38485: (wasabi222) bgp.config not working (refs: #38499_)
PR #38499: (mirceaulinic) Fix #38485_ (refs: #38577_) @ 2017-01-01 17:42:15 UTC
- 0a09049a2d Merge pull request #38499_ from cloudflare/FIX-38485
- 18018139f3 Fix #38485_
PR #38501: (mvdwalle) Do not assume every object is a server @ 2017-01-01 17:37:57 UTC
- 13f0b809df Merge pull request #38501_ from mvdwalle/fix-gogrid-list-password
- bd7dee9a10 Do not assume every object is a server
PR #38461: (anlutro) Improvements/fixes to kapacitor task change detection @ 2016-12-29 17:08:47 UTC
- aa0c843553 Merge pull request #38461_ from alprs/fix-kapacitor_changes
- 52721e97d6 clean up and fix tests
- 8648775c2a if task is not defined, it's not up to date
- c3ab954c6e improvements/fixes to kapacitor task change detection
PR #38473: (twangboy) Change OSX/OS X to macOS where possible @ 2016-12-29 16:35:11 UTC
- 2c51eb9d16 Merge pull request #38473_ from twangboy/osx_to_macos
- e96bfe8fa2 Change OSX/OS X to macOS where possible
PR #38412: (bbinet) Update PillarStack stack.py to latest upstream version @ 2016-12-28 19:28:40 UTC
- 2497fb547e Merge pull request #38412_ from bbinet/pillarstack-updates
- b66b4bd060 Fix lint violations in stack.py
- 6a30fe6aeb Update PillarStack stack.py to latest upstream version
PR #38456: (twangboy) Gate Windows Specific Salt Utils @ 2016-12-28 18:44:33 UTC
- 5395d3210a Merge pull request #38456_ from twangboy/gate_win_utils
- d34d110a84 Fix lint, fix boto module
- c20111142f Gate Windows Utils
PR #38428: (gqgunhed) fixed typo: lq command-line syntax @ 2016-12-27 15:42:02 UTC
- 7c7799162b Merge pull request #38428_ from gqgunhed/fix_lq_typo
- d79d682e8b fixed typo: lq command-line syntax
ISSUE #38443: (lorengordon) 2016.11 breaks file.managed on Windows (refs: #38444_)
ISSUE #34101: (windoverwater) archive.extracted breakage due to 2016.3.0 upgrade from 2015.8.10 (refs: #37368_)
PR #38444: (lorengordon) Adds new import required for extract_hash @ 2016-12-27 15:37:20 UTC
- PR #37368: (terminalmage) Overhaul archive.extracted state (refs: #38444_)
- f5984d0f81 Merge pull request #38444_ from lorengordon/issue-38443
- b2925ad7b7 Adds new import required for extract_hash
ISSUE #38071: (luochun-95) remote execute is very slow (refs: #38167_)
PR #38167: (cachedout) Kill pkg_resources for CLI tools [DO NOT MERGE] @ 2016-12-22 22:11:22 UTC
- 4c4f07ca4c Merge pull request #38167_ from cachedout/no_pkg_resources
- ec6901720a Remove debugging
- f28e33b9b6 Remove from all but salt cli
- bb3af72317 Remove from salt-call
- c676846066 Kill pkg_resources for CLI tools
PR #38417: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2016-12-22 19:00:44 UTC
- 2fc8c154af Merge pull request #38417_ from rallytime/merge-2016.11
- efb8a8ddf5 Merge branch '2016.3' into '2016.11'
- 27253522c8 Improve pillar documentation (#38407_)
- 423b1fddff Merge pull request #38398_ from terminalmage/issue38372
  - c80dbaa914 Fix call to file.get_managed in cron.file state
- 5a33d1e697 Fix http.query when result has no text (#38382_)
- b74b5c7d38 Merge pull request #38390_ from meaksh/2016.3-fix-try-restart-for-autorestarting-on-SUSE-systems
  - de6ec05ec0 add try-restart to fix autorestarting on SUSE systems
- 2c3a39760a Merge pull request #38221_ from UtahDave/fix_default_returner
  - 385640765b remove a blank line to satisfy linter
  - 9c248aa14c validate return opt, remove default.
  - 8bb37f9fe7 specify allowed types and default for "returner"
  - 11863a4bfe add examples of default minion returners
  - e7c6012655 add support for default returners using return
PR #38342: (scthi) Bugfix ext pillar nodegroups @ 2016-12-22 16:47:42 UTC
- bbc149c67f Merge pull request #38342_ from scthi/bugfix-ext-pillar-nodegroups
- dba315c4b6 ext-pillar nodegroups works for all minions now.
PR #38403: (terminalmage) git_pillar: Document the transition from env to saltenv in the jinja context @ 2016-12-22 16:34:48 UTC
- 453476d982 Merge pull request #38403_ from terminalmage/document-saltenv
- 0a72e0f0be git_pillar: Document the transition from env to saltenv in the jinja context
ISSUE #38253: (gmacon) There was no error installing package 'setuptools' although it does not show when calling 'pip.freeze'. (refs: #38354_)
PR #38354: (gmacon) Use --all when calling pip.py @ 2016-12-20 20:40:21 UTC
- 12436efb54 Merge pull request #38354_ from gmacon/pip-freeze-all
- dca24b270e Use --all when calling pip.py
PR #38348: (rallytime) Update autodoc topics for new modules added in 2016.11 @ 2016-12-20 20:36:20 UTC
- 68430b1fa6 Merge pull request #38348_ from rallytime/mod-docs-2016.11
- b31c2412ca Add iter and next options to doc/conf.py
- b8c16094c4 Revert "Move import/error messaging logic for snapper module into virtual()"
- 640db5b5ac Move import/error messaging logic for snapper module into virtual()
- 366271f459 Add snapper to state index doc module list
- 135d254c80 Remove netapi autodoc files: they should not be added as their doc structure is different
- 0006139aca Update autodoc topics for new modules added in 2016.11
PR #38377: (DmitryKuzmenko) Implementation and docs for Consul key-value store plugin for minion data cache. @ 2016-12-20 20:36:02 UTC
- 6ee7b2bae7 Merge pull request #38377_ from DSRCorporation/features/consul_cache
- 6fb4430ae3 Configuration options and documentation for Consul data cache plugin.
- dad748f57a Data cache plugin configuration documentation.
- c7209cd90c Consul data cache plugin.
PR #38373: (rallytime) Back-port #38212_ to 2016.11 @ 2016-12-20 20:35:09 UTC
- PR #38212: (disaster123) ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) (refs: #38373_)
- f6d1b559bc Merge pull request #38373_ from rallytime/bp-38212
- 52fc6daac0 ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog)
PR #38374: (mirceaulinic) NAPALM proxy module: Fix optional_args key issue @ 2016-12-20 20:34:59 UTC
- 69c3f19fc1 Merge pull request #38374_ from cloudflare/FIX-NAPALM-PROXY
- 44169315d8 Fix optional_args key issue
ISSUE #38048: (ezh) [2016.11.0] Salt-cloud throws TypeError exception (refs: #38073_)
PR #38073: (ezh) 2016.11 @ 2016-12-20 14:51:11 UTC
- 530f495955 Merge pull request #38073_ from doublescoring/2016.11
- 42d3d26f28 [38073] Fix test assertion
- 9b37ead913 Fix broken os.write without string.encode
PR #38344: (bbinet) Fix influxdb_database.present state @ 2016-12-20 13:57:45 UTC
- 67908d5aba Merge pull request #38344_ from bbinet/fix-influx-createdb
- c6b075d6f4 Fix influxdb_database.present state
PR #38358: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2016-12-20 00:11:48 UTC
- 04d6898958 Merge pull request #38358_ from rallytime/merge-2016.11
- c6e191ad0d Remove doc markup references from 2016.11 branch
- 513058945c Merge branch '2016.3' into '2016.11'
- 09d9cff992 Merge pull request #38288_ from terminalmage/archive-extracted-local-source-2016.3
  - 845e3d0e75 Update tests to reflect change in cache behavior
  - 5a08d7c70a archive.extracted: don't try to cache local sources (2016.3 branch)
- bf37667f8a Merge pull request #38312_ from cro/proxy_config_in_cfg
  - 2006c4000e Typo
  - 689d95b10f Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy.
- c83db5a785 Merge pull request #38320_ from rallytime/cleanup-doc-refs
  - 62978cb7a0 Don't check the doc/conf.py file for doc markup refs
  - 770e732d76 Add a unit test to search for new doc markup refs
  - 5c42a361a0 Remove ":doc:" references from all doc/topics/installation/* files
  - 23bce1c929 Remove ":doc:" references from all doc/topics/releases/* files
  - 4aafa41d22 Remove ":doc:" references from a bunch of doc/* files
  - 02bfe7912c Remove more ":doc:" references from doc/* files
  - 6e32267d0c Remove ":doc:" references in salt/* files
- PR #38285: (terminalmage) archive.extracted: don't try to cache local sources
PR #37947: (vutny) Fix salt-minion initscript for RHEL5 (SysV) to pick up proper python version @ 2016-12-19 21:03:50 UTC
- 13414949e3 Merge pull request #37947_ from vutny/fix-rhel5-minion-init
- c94e798b8a SysV init script for rpm: get and show unique PIDs only
- 8ff68c4128 Fix initscript for RHEL5 (SysV) to pick up proper python version
PR #38106: (techhat) "test" is not necessarily in opts, for thorium @ 2016-12-19 14:40:32 UTC
- 4d072ca689 Merge pull request #38106_ from techhat/stateget
- 5edc16f606 "test" is not necessarily in opts, for thorium
PR #38333: (amendlik) Suppress errors when checking if an alternative exists @ 2016-12-19 13:40:49 UTC
- a01fade604 Merge pull request #38333_ from amendlik/states-alternatives
- 8bfcd5bcd5 Adjust alternatives test for updated error message
- 09dee3c611 Suppress errors when checking if an alternative exists
PR #38340: (ewapptus) Backport PR #38251_: Fixed nested orchestrate not respecting failures @ 2016-12-19 13:31:16 UTC
- PR #38251: (ewapptus) Fixed nested orchestrate not respecting failures (refs: #38340_)
- 15d3b476e9 Merge pull request #38340_ from ewapptus/bp-38251
- 266e0a465c Fixed nested orchestrate not respecting failures
PR #38229: (mcalmer) provide kwargs of sls_build to dockerng.create @ 2016-12-18 13:13:10 UTC
- ecd441d090 Merge pull request #38229_ from mcalmer/dockerng-sls_build-kwargs
- e7292fabb7 make it explicit that we want to delete these keys
- 4c710139b5 use default values for pop() to prevent KeyError raised
- 455c18325c provide kwargs to dockerng.create to provide all features to sls_build as well
ISSUE #36204: (stanvarlamov) Salt-Cloud: salt.runners.cloud.create exits with True on Python process (ec2.py) exception (refs: #37333_)
PR #38309: (ewapptus) Backport PR #37333_: Fixed state.salt.runner() reporting success on exceptions @ 2016-12-18 12:39:53 UTC
- PR #37333: (benediktwerner) Fixed state.salt.runner() reporting success on exceptions (refs: #38309_)
- d2ce9c3e71 Merge pull request #38309_ from ewapptus/bp-37333
- a2b1259671 Fixed display of errors
- 14a39f914e Fixed state.salt.runner return value on exceptions
PR #38323: (rallytime) Update the Cloud Provider Specifics links in cloud docs @ 2016-12-18 12:30:49 UTC
- ebb9f6cbbc Merge pull request #38323_ from rallytime/update-cloud-provider-links
- 022caf23e9 Update the Cloud Provider Specifics links in cloud docs
PR #38324: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2016-12-18 12:30:26 UTC
- 5bd7471e30 Merge pull request #38324_ from rallytime/merge-2016.11
- 5940db5b3f Merge branch '2016.3' into '2016.11'
  - 6367ca7d2a Add nick to args for create_multi (#38281_)
  - 235682b1e6 Merge pull request #38313_ from dragon788/2016.3-chocolatey-fix
    - 1f5fc17551 Use machine readable output for list
    - cdbd2fbe3c Added limit-output to eliminate false packages
  - 9e78ddc80e Merge pull request #38279_ from rallytime/fix-38174
    - 4a62d01577 Add docs for syndic_wait setting
ISSUE #38246: (martintamare) Windows Minion unable to start via nssm (refs: #38247_)
PR #38325: (rallytime) Back-port #38247_ to 2016.11 @ 2016-12-18 12:28:41 UTC
- PR #38247: (martintamare) fix(win_function): handle other language (refs: #38325_)
- 83523d2f73 Merge pull request #38325_ from rallytime/bp-38247
- 4b6c5438e3 fix(win_functions): syntax
- e602f17e3d fix(win_function): handle other language
ISSUE #30195: (Vaelatern) Add Void Linux support in Salt (refs: #31262, #38326)
PR #38326: (yopito) fix runit init support (grain init) in 2016.11 @ 2016-12-18 12:07:25 UTC
- PR #31262: (Vaelatern) Add support for Void Linux (refs: #38326_)
- 54a2bb95de Merge pull request #38326_ from yopito/fix-runit-init-support
- 25b91bb686 fix detection of runit as init system (grain init)
- PR #38322: (rallytime) Add azurearm module to doc index
PR #38305: (dereckson) Avoid normalization call for normalized mode value @ 2016-12-16 17:31:25 UTC
- 1e4f299e7d Merge pull request #38305_ from dereckson/fix-mode-extraneous-normalization
- 573ac3565e Avoid normalization call for normalized mode value
- PR #38291: (terminalmage) Improve documentation for archive.extracted in 2016.11
ISSUE #37966: (Cybolic) salt-cloud EC2 instance can't be initiated (refs: #37967_)
PR #38298: (rallytime) Back-port #37967_ to 2016.11 @ 2016-12-16 15:20:04 UTC
- PR #37967: (Cybolic) Fixed faulty logic preventing instance initialisation. (refs: #38298_)
- 3cf0135d50 Merge pull request #38298_ from rallytime/bp-37967
- 42d367f39d Fixed faulty logic preventing instance initialisation.
ISSUE #38070: (ezh) [2016.11.0] Salt-cloud throws UnicodeDecodeError exception (refs: #38076_)
PR #38076: (ezh) Fix decoding of broken string from remote sources @ 2016-12-15 19:05:25 UTC
- f4f0036f30 Merge pull request #38076_ from doublescoring/fix-2016.11-38070
- 70c8db5489 Fix decoding of broken string from remote sources
PR #38278: (rallytime) Back-port #38207_ to 2016.11 @ 2016-12-15 18:09:27 UTC
- PR #38207: (tsaridas) remove empty strings from list but not ones with one empty space char (refs: #38278_)
- PR #38188: (tsaridas) fix for push_dir in different OS (refs: #38203, #38207)
- 2ccab22c19 Merge pull request #38278_ from rallytime/bp-38207
- 5e8bf571d8 python3 compatibility and fix pylint
- e0df047000 remove empty strings from list but not ones with one empty space char
PR #38277: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2016-12-15 18:09:10 UTC
- a748e842a8 Merge pull request #38277_ from rallytime/merge-2016.11
- 49a3355915 Merge branch '2016.3' into '2016.11'
- fc9e1dff35 Merge pull request #38248_ from meaksh/salt-api-successfully-close-child-processes
  - ee6eae9855 Successfully exit of salt-api child processes when SIGTERM.
- 3c718ed35e Merge pull request #38254_ from terminalmage/check-pillarenv
  - fa9ad311c6 Also check if pillarenv is in opts
- 6b9060c38f [2016.3] Bump latest release version to 2016.11.1 (#38256_)
ISSUE #38231: (tjuup) Typo: salt-key deleted (refs: #38232_)
PR #38232: (rallytime) Strip final 'e' in key cmd to correct "deleted" misspelling @ 2016-12-15 10:38:49 UTC
- 0af343e71f Merge pull request #38232_ from rallytime/fix-38231
- 26e1ee3650 Strip final 'e' in key cmd to correct "deleted" misspelling
ISSUE #38200: (sebw) selinux.mode doesn't return any output and doesn't persist (refs: #38236_)
PR #38236: (gtmanfred) SELINUXTYPE should not be changed @ 2016-12-15 10:37:06 UTC
- 6c1ca9dae7 Merge pull request #38236_ from gtmanfred/2016.11
- d1b070c894 clean up selinux unit test
- 96eabd4939 SELINUXTYPE should not be changed
ISSUE #38228: (vquiering) archive.extracted with options and user/group (refs: #38262_)
PR #38262: (terminalmage) Fix archive.extracted when --strip or --strip-components is in the options @ 2016-12-15 08:57:18 UTC
- fd32dc3e9b Merge pull request #38262_ from terminalmage/issue38228
- 6442f8a7b5 Add tests for --strip/--strip-components
- c502e68f12 Detect --strip/--strip-components in tar options and handle properly
- e95770594d Add strip_components arg to archive.list
PR #38264: (mirceaulinic) Port #37862_ into 2016.11 @ 2016-12-15 08:51:20 UTC
- PR #37862: (mirceaulinic) [2016.11.1] Docstring fixes and new features for napalm_network (refs: #38264_)
- b232bd8ce8 Merge pull request #38264_ from cloudflare/PORT-37862
- 28bbb73151 Import from napalm_base instead of napalm
- 0a675afc40 Vice-versa docstring
- 09c50176e2 More docfix
- 215b8f38e2 Lint cleanup
- PR #38260: (rallytime) Add 2016.11.2 release notes
- PR #38257: (rallytime) [2016.11] Bump latest release version to 2016.11.1
- PR #38233: (terminalmage) Correct an inaccurate warning when top_file_merging_strategy == merge_all
PR #38234: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2016-12-13 18:28:02 UTC
- ba62fcf2ec Merge pull request #38234_ from rallytime/merge-2016.11
- 6a327d1367 Merge branch '2016.3' into '2016.11'
- 004e46afe7 Merge pull request #38198_ from vutny/unit-tests-require-libcloud-boto3
  - a6098bac1a Remove note about SaltTesting installation, now it is in the requirements
  - 004bff113e Add missing requirements for running unit tests: libcloud and boto3
- 9d497bc74c Merge pull request #38213_ from rallytime/skip-tls-test
  - bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors
- 203109dd17 Merge pull request #38224_ from whiteinge/cors-options-unauthed
  - de4d3227ab Allow CORS OPTIONS requests to be unauthenticated
- 721a5feccd Merge pull request #38223_ from whiteinge/salt-api-root_dirs
  - bfbf390c0e Add root_dir to salt-api file paths
PR #38205: (rallytime) [2016.11] Merge forward from 2016.3 to 2016.11 @ 2016-12-12 18:13:18 UTC
- 7ead1ed336 Merge pull request #38205_ from rallytime/merge-2016.11
- e31f97cf71 Merge branch '2016.3' into '2016.11'
- 70f7d22ad6 Merge pull request #38191_ from terminalmage/issue38162
  - 1ae543a98a Clarify the fact that git_pillar.update does not fast-forward
- 28171cbfc5 Merge pull request #38194_ from vutny/integration-test-requirements-doc
  - e9f419ff64 Document the requirements for running ZeroMQ-based integration tests
- a4ef037ab1 Merge pull request #38185_ from rallytime/bp-38181
- 609f814454 Reset socket default timeout to None (fixes daemons_tests failures)
PR #38203: (rallytime) Back-port #38188_ to 2016.11 @ 2016-12-12 17:48:51 UTC
- PR #38188: (tsaridas) fix for push_dir in different OS (refs: #38203, #38207)
- 669409d681 Merge pull request #38203_ from rallytime/bp-38188
- 50d3200b12 removing not needed join
- 7af708e1e7 fix for push_dir in different OS