rallytime
28cb062697
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 10:52:55 -07:00
Thomas Jackson
dcabee3ef5
Rework to expose __authenticate()
...
This way when there is a key rotation we don't have to do any class hacks, just a simple function call
2015-01-09 09:08:56 -08:00
Thomas Jackson
aad2df66ae
Log AES rotation in the master daemon
2015-01-09 09:08:50 -08:00
Justin Findlay
acd2655770
fix some commands
2015-01-09 09:58:41 -07:00
Thomas Jackson
fb747fa664
Refactor SAuth() to return singletons for each master/minion pair.
...
This means that anyone who calls the SAuth() constructor will get a singleton for the requested minion/master pair-- meaning we no longer have to do all of that work up in the channels.
Not only is this cleaner, it now means that a minion start-up now takes 1 auth instead of 3 (since some modules get SAuth() directly).
2015-01-09 08:28:58 -08:00
Nicole Thomas
76c5d5a372
Merge pull request #19568 from rallytime/pylints
...
Pylint fix for 2015.2 branch
2015-01-09 09:16:53 -07:00
rallytime
ff1985567b
Pylint fix for 2015.2 branch
2015-01-09 09:14:44 -07:00
Flavian
d3fc846450
#19162 added disks to Azure VM creation. Only new empty disks are
...
supported. Add a line
volumes:
- { size: 10 (default 100), lun: [0-15](default: 0), disk_label:
<label>(default: <role-name>-disk-<lun>) }
2015-01-09 15:51:13 +01:00
Flavian Hautbois
6a8fdf0e51
Merge pull request #1 from saltstack/develop
...
Merge 09/01
2015-01-09 15:04:23 +01:00
Rupesh Tare
84afffcb0a
Implemented unit test cases for debconfmod module
2015-01-09 17:05:13 +05:30
Diep Pham
65ee96b2a3
add pkgrepo.managed clean_file option
2015-01-09 17:12:53 +07:00
Thomas S Hatch
b02862ae72
Merge pull request #19547 from rallytime/bp-19380
...
Backport #19380 to 2015.2
2015-01-08 22:03:04 -07:00
Thomas S Hatch
4c17b14224
Merge pull request #19549 from rallytime/bp-19517
...
Backport #19517 to 2014.7
2015-01-08 22:02:25 -07:00
Thomas S Hatch
22c8a42180
Merge pull request #19552 from terminalmage/issue19540
...
Fix regression in pillar cache
2015-01-08 22:01:13 -07:00
Thomas S Hatch
47d1e65dfe
Merge pull request #19556 from rallytime/fix_brew_mod
...
Add python_shell kwarg to brew module
2015-01-08 22:00:38 -07:00
Mike Place
6b24117edd
Merge pull request #19558 from cachedout/reactor_exit
...
Don't let sys exits bubble into the reactor.
2015-01-08 17:42:49 -07:00
Mike Place
a0cf68acc0
Don't let sys exits bubble into the reactor.
...
Though async should prevent this, here is an additional layer of safety
to prevent an uncaught exit from killing a master
2015-01-08 17:41:43 -07:00
Mike Place
b5c0dbe0ed
Cleanup jboss module
...
Closes #18600
2015-01-08 17:15:05 -07:00
rallytime
a8c9f95ab8
Add python_shell kwarg to brew module
2015-01-08 17:09:25 -07:00
Mike Place
783de9584a
Merge pull request #19555 from cachedout/check_cwd
...
Check cwd before running saltcmd
2015-01-08 17:04:28 -07:00
Mike Place
9a717bcc4f
Check cwd before running saltcmd
2015-01-08 17:03:09 -07:00
Thomas S Hatch
8dd6f36c0c
Merge pull request #19554 from rallytime/fix_disk_mod
...
Move python shell kwarg to correct place
2015-01-08 17:02:40 -07:00
rallytime
635898c850
Move python shell kwarg to correct place
2015-01-08 17:00:46 -07:00
Thomas S Hatch
4ff285a002
Merge pull request #19511 from gracinet/19329-pillar-introspection
...
Provide modules.pillar.obfuscate and modules.pillar.ls
2015-01-08 16:56:53 -07:00
Mike Place
864b09a1d5
Merge pull request #19553 from cachedout/issue_16227
...
Minor doc issue
2015-01-08 16:52:30 -07:00
Mike Place
5f6f52f08d
Minor doc issue
...
Closes #16227
2015-01-08 16:50:38 -07:00
Thomas S Hatch
2623aa672d
Merge pull request #19541 from jfindlay/fix_pip
...
change one more pip command
2015-01-08 16:44:59 -07:00
Thomas S Hatch
081c96c43f
Merge pull request #19537 from rallytime/bp-19344
...
Backport #19344 to 2014.7
2015-01-08 16:44:35 -07:00
Erik Johnson
1996656185
Look in local files for pillar data on masterless
2015-01-08 17:44:32 -06:00
Thomas S Hatch
7941a4a738
Merge pull request #19534 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-08 16:44:18 -07:00
Erik Johnson
e063c60691
Add a __pillar key to opts
2015-01-08 17:44:16 -06:00
Thomas S Hatch
31f825d9f2
Merge pull request #19539 from terminalmage/fix-archive-tests
...
Update archive tests to use python_shell=False
2015-01-08 16:43:09 -07:00
Thomas S Hatch
9f2ee27b02
Merge pull request #19542 from jfindlay/fixup_svn
...
fix svn module str + list error
2015-01-08 16:42:23 -07:00
Mike Place
854088c649
Merge pull request #19551 from cachedout/minor_note
...
Release note note
2015-01-08 16:41:46 -07:00
Mike Place
b419366443
Release note note
...
Fixes #18551
2015-01-08 16:41:20 -07:00
Nicole Thomas
c6bd6971d2
Merge pull request #19538 from rallytime/bp-19368
...
Backport #19368 to 2014.7
2015-01-08 16:39:05 -07:00
Flavian
3fe0ec8b58
Azure: catch a benign WindowsAzureConflictError when trying to create a
...
service that already exists. In delete if kwargs is None, set it to an
empty dict.
#19155
2015-01-08 16:23:28 -07:00
vs
10e772cf21
improve master.status to work with host fqdns/hostnames as well as ips
...
The former version only worked with IPs which is kind of limited and
has been reported as bugs.
2015-01-08 16:17:26 -07:00
Thomas Jackson
48aa021067
Cache channel auth based on master_uri and minion_id
2015-01-08 14:39:28 -08:00
Thomas Jackson
f5347be759
Revert "Revert "Cleanup and performance tweaks""
...
This reverts commit 86e231bb51
2015-01-08 14:38:17 -08:00
rallytime
ea769829af
Fix my pylint errors
2015-01-08 15:09:55 -07:00
Mike Place
372cd762c6
Merge pull request #19544 from saltstack/revert-19318-develop
...
Revert "Cleanup and performance tweaks"
2015-01-08 14:57:57 -07:00
Mike Place
86e231bb51
Revert "Cleanup and performance tweaks"
2015-01-08 14:57:04 -07:00
Colton Myers
174290b7aa
Add python_shell=False to all the linux_acl mocks
2015-01-08 14:29:41 -07:00
Justin Findlay
1768e429f5
fix svn module str + list error
2015-01-08 14:29:20 -07:00
Colton Myers
4f851c99ab
Fix gem tests
2015-01-08 14:26:04 -07:00
Justin Findlay
b13532b547
change one more command
2015-01-08 13:57:10 -07:00
rallytime
41841701e7
Fix djangomod.py integration test failures
2015-01-08 12:57:11 -07:00
rallytime
2443d11282
Change file perms back to executable
2015-01-08 12:56:27 -07:00
rallytime
8eab15780e
Change file perms on runtests.py
2015-01-08 12:56:17 -07:00
