valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,742 Commits 24 Branches 182 Tags 341 MiB
cc83fa151a
Commit Graph

70742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
cc83fa151a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
 2016-06-28 17:34:27 -06:00
Nicole Thomas
c89d1ad27f Merge pull request #34348 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-28 19:28:45 -04:00
rallytime
c87a108a12 Don't forget the pylint disables for range 2016-06-28 16:52:37 -06:00
Nicole Thomas
a9ea3444ad Back-port #34256 to 2016.3 (#34343) 
* detect running from master in State.event method

This changes `State.event` to detect whether the state that invoked `fire_event` is running on the master. This fixes an issue where the `fire_event` requisite doesn't work when being used in orchestration states.

* fix linting issues
 2016-06-28 18:08:48 -04:00
rallytime
359e8ca2ce Pylint fixes 2016-06-28 16:04:47 -06:00
Thomas S Hatch
0b9cb602fe Merge pull request #34338 from themalkolm/patch-2 
Add listen/listen_in support to stateconf.py
 2016-06-28 15:50:14 -06:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
Erik Johnson
f6bd1ad47e Revert py3modernize lint changes (#34339) 
* salt/__init__.py: revert py3modernize lint changes

* salt/cloud/clouds/vmware.py: revert py3modernize lint changes

* salt/modules/jboss7_cli.py: revert py3modernize lint changes

* salt/payload.py: revert py3modernize lint changes

* salt/serializers/yamlex.py: revert py3modernize lint changes

* salt/states/win_servermanager.py: use absolute imports

* salt/utils/args.py: revert py3modernize lint changes

* salt/utils/decorators/__init__.py: use __name__ instead of func_name

__name__ is py3-compatible and also works on builtins in py2, which
func_name does not.

* salt/utils/compat.py: revert py3modernize lint changes

* salt/utils/__init__.py: revert py3modernize lint changes

* salt/version.py: revert py3modernize lint changes

* tests/salt-tcpdump.py: revert py3modernize lint changes
 2016-06-28 16:04:02 -04:00
Mike Place
80a659bb51 Merge pull request #34283 from sjorge/2016.3-mount-fstab 
2016.3 mount vfstab support
 2016-06-28 12:23:39 -07:00
Mike Place
4feea285d4 Merge pull request #34248 from anderbubble/bugfix/find-depth 
Correct handling of min/maxdepth during file.find (#34217)
 2016-06-28 12:19:18 -07:00
Mike Place
dfa29a8325 Merge pull request #34277 from bodhi-space/develop 
Several new boto_* functions and a couple of bugfixes
 2016-06-28 12:09:19 -07:00
Mike Place
75aad073a9 Merge pull request #34322 from Ch3LL/add_grains_majorrelease_test 
add osmajorrelease grain for raspbian
 2016-06-28 12:08:39 -07:00
Mike Place
046bdaa9f2 Merge pull request #34306 from ghedo/iptables_flush_table 
Fix iptables.flush state: Do not force 'filter' table when flushing
 2016-06-28 12:03:14 -07:00
Mike Place
31de61eca3 Merge pull request #34256 from tmehlinger/master-fire-event-orchestration 
detect running from master in State.event method
 2016-06-28 12:01:20 -07:00
Mike Place
cd35e73ef6 Merge pull request #34326 from Inveracity/add-feature-mongodb-events 
feature mongodb return events
 2016-06-28 11:43:15 -07:00
Mike Place
81547f413d Merge pull request #34337 from clinta/serialize-merge 
Change merge-if-exists logic to properly report changes
 2016-06-28 11:41:56 -07:00
Mike Place
affc65dc79 Merge pull request #34300 from vutny/fix-apache-vhost-options 
Make apache.configfile state handle the Options list correctly
 2016-06-28 11:34:45 -07:00
Mike Place
421c5bfe8b Merge pull request #34316 from edgan/salt-ssh-retcode 
Making salt-ssh pass proper return codes for jinja rendering errors
 2016-06-28 11:32:20 -07:00
Alexander Krasnukhin
cd63541325 Add listen/listen_in support to stateconf.py 
Add `listen/listen_in` everywhere where `watch/watch_in` is used.
 2016-06-28 19:11:54 +02:00
Clint Armstrong
ebe7def2fb Change merge-if-exists logic to properly report changes 2016-06-28 12:55:27 -04:00
Mike Place
e81bd6ee94 Test custom grains matcher (#34324) 
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
 2016-06-28 12:17:14 -04:00
jacobhammons
0c60feac02 Doc clarifications to file modules, addition of new profile log level to docs, fixed example in dnsmasq (#34323) 
Refs #34249
Refs #34261
Refs #33694
Refs #34247
 2016-06-28 12:03:59 -04:00
Nicole Thomas
af83f59313 version checking had a logical error (#34333) 
The current version of rabbitmq, 3.6.2 was not matched
 2016-06-28 11:51:36 -04:00
Clint Armstrong
53de70f658 fix #34329 (#34330) 2016-06-28 11:40:40 -04:00
Erik Johnson
b793426c23 Remove unnecessarily-disabled sanity check (#34325) 
This was commented out for reasons having nothing to do with anything
else going on in 0c069dd. Uncommenting this sanity check so that we are
notified if we need to update our targets in the future.
 2016-06-28 11:12:55 -04:00
Nicole Thomas
c5890a0eca Merge pull request #34335 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-28 11:07:15 -04:00
rallytime
2296587536 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-06-28 09:04:56 -06:00
Alessandro Ghedini
882c6c9c86 Do not force 'filter' table when flushing 
The "table" argument is already part of the function signature, this means
that flush() will always force the "filter" table even when the user sets
a different one.
 2016-06-28 15:40:50 +01:00
Christopher Baklid
510d2eda15 git client crashed during first commit 2016-06-28 10:27:13 +02:00
Christopher Baklid
d3f12af4fb adding events to mongodb future returner 
tested with pymongo 3.2
and mongodb 3.2.7
 2016-06-28 10:20:42 +02:00
Ch3LL
693cc61aa4 add osmajorrelease to ubuntu and fix pylint 2016-06-27 16:32:21 -06:00
Nicole Thomas
76c8bb0d1c Use correct feature branch name (#34317) 2016-06-27 18:26:19 -04:00
Nicole Thomas
e168b05a87 Fix psutil.cpu_times unpack error (#34318) 2016-06-27 18:25:58 -04:00
Nicole Thomas
a6d3cc637b Typo in dockerio doc (#34319) 2016-06-27 18:25:19 -04:00
Ch3LL
2fc3e8a54b add osmajorrelease grain for raspbian 2016-06-27 14:45:09 -06:00
Nathan Grennan
06ca903178 Making salt-ssh pass proper return codes for jinja rendering errors 2016-06-27 12:42:55 -07:00
Nicole Thomas
6cce545d92 Merge pull request #34313 from rallytime/bootstrap-2015.5 
[2015.5] Update to latest bootstrap script v2016.06.27
 2016-06-27 15:00:08 -04:00
Nicole Thomas
dd4c937009 Merge pull request #34312 from rallytime/bootstrap-2015.8 
[2015.8] Update to latest bootstrap script v2016.06.27
 2016-06-27 14:59:59 -04:00
Nicole Thomas
1398b1c51e Merge pull request #34311 from rallytime/bootstrap-2016.3 
[2016.3] Update to latest bootstrap script v2016.06.27
 2016-06-27 14:59:27 -04:00
Nicole Thomas
3d6f58f63b Merge pull request #34310 from rallytime/bootstrap-develop 
[develop] Update to latest bootstrap script v2016.06.27
 2016-06-27 14:59:19 -04:00
Jonathon Anderson
a044af9a10 Update for PEP8 E302 conformity 2016-06-27 12:29:48 -06:00
Mike Place
0db7e17b23 Merge pull request #34301 from themalkolm/patch-1 
Update correct default value for spm_build_dir
 2016-06-27 11:22:25 -07:00
rallytime
53b06e6eee [develop] Update to latest bootstrap script v2016.06.27 2016-06-27 12:18:39 -06:00
rallytime
75aa7047bc [2016.3] Update to latest bootstrap script v2016.06.27 2016-06-27 12:17:53 -06:00
rallytime
944a393f89 [2015.8] Update to latest bootstrap script v2016.06.27 2016-06-27 12:16:55 -06:00
rallytime
c7db73be92 [2015.5] Update to latest bootstrap script v2016.06.27 2016-06-27 12:15:26 -06:00
Mike Place
11a0747da6 Merge pull request #34304 from rallytime/bp-33734 
Back-port #33734 to 2016.3
 2016-06-27 10:41:59 -07:00
Mike Place
91703d2dc4 Merge pull request #34307 from rallytime/fix-test-example 
Fix test example in integration testing docs
 2016-06-27 10:41:24 -07:00
Tom Williams
90b03d9c67 INFRA-1593 - update a couple of log message levels. 2016-06-27 13:39:53 -04:00
Mike Place
0edc04536d Merge pull request #34282 from techhat/azureifaces 
Properly delete/clean up interfaces
 2016-06-27 10:10:11 -07:00