rallytime
6486d9794b
More returner doc formattting and versionadded tags
2015-03-24 14:27:01 -06:00
rallytime
5c37ebb634
Add some versionadded tags to --return_config and clean up formatting
...
Fixes #21933
2015-03-24 14:09:41 -06:00
Mike Place
bdf5255ab8
Merge pull request #21936 from whiteinge/doc-http-versionadded-pt-deux
...
Added waaaay more versionaddedd directives to even more http modules
2015-03-24 09:03:56 -06:00
Seth House
b0eb40f677
Added waaaay more versionaddedd directives to even more http modules
2015-03-24 10:46:40 -04:00
Seth House
6bfa2c2493
Merge pull request #21934 from whiteinge/doc-http-versionadded
...
Added missing versionadded directives to the new http modules
2015-03-24 10:00:59 -04:00
Seth House
d175d52425
Added missing versionadded directives to the new http modules
2015-03-24 09:55:11 -04:00
Thomas S Hatch
436f37e08b
Merge pull request #21812 from jacksontj/2015.2
...
Re-work timeouts in saltnado
2015-03-23 19:22:27 -06:00
jfindlay
6e6f5dd909
Merge pull request #21916 from whiteinge/pkg.uptodate-kwargs
...
Pass kwargs from pkg.uptodate state function to pkg.upgrade execution function
2015-03-23 19:20:01 -06:00
Thomas S Hatch
d55bec3058
Merge pull request #21919 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-03-23 19:09:01 -06:00
Thomas S Hatch
caf8ec63c3
Merge pull request #21898 from basepi/runner.job.cache
...
Save the load for returner job cache calls
2015-03-23 19:06:17 -06:00
Colton Myers
9b75abb686
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/renderers/pyobjects.py
2015-03-23 16:28:05 -06:00
Nicole Thomas
e07220d529
Merge pull request #21901 from cachedout/deepcopy_opts
...
Deep copy opts
2015-03-23 15:56:03 -06:00
Seth House
5f9f85b1f8
Pass kwargs from pkg.uptodate state function to pkg.upgrade execution function
2015-03-23 17:45:19 -04:00
jfindlay
dda83245c2
Merge pull request #21905 from jacksontj/loader
...
Add LazyLoader and Singleton auth to 2015.2 release notes
2015-03-23 13:24:23 -06:00
Thomas Jackson
3f54c3a7e8
Have per-job minions_remaining
2015-03-23 12:13:50 -07:00
Thomas Jackson
2512a0841d
Add LazyLoader and Singleton auth to 2015.2 release notes
2015-03-23 11:42:48 -07:00
jfindlay
9121fbb2a8
Merge pull request #21899 from terminalmage/fix-docker-push
...
Fix docker.push
2015-03-23 12:36:11 -06:00
Mike Place
3a5f36dc32
Deep copy opts
...
Fixes bug with highstate routing file client asymetrically
2015-03-23 11:51:57 -06:00
Erik Johnson
6b37c93f85
Fix docker.push
...
This was broken in cfae05b
2015-03-23 12:32:11 -05:00
Colton Myers
7b736e642f
Save the load for returner job cache calls
2015-03-23 11:24:11 -06:00
jfindlay
8c80b82c9f
Merge pull request #21894 from corywright/debian-bonding-dashes
...
Use dashes instead of underscores in Debian based bonding networking options
2015-03-23 10:59:17 -06:00
Cory Wright
90529d3293
Use dashes instead of underscores in Debian based bonding networking options
...
Fixes #21892
2015-03-23 12:00:54 -04:00
jfindlay
ba083a657d
Merge pull request #21872 from borgstrom/issue-21796-2014.7
...
Remove _locals from the final exec call in pyobjects (2014.7)
2015-03-21 11:04:30 -06:00
jfindlay
60e9571da6
Merge pull request #21873 from borgstrom/issue-21796-2015.2
...
Remove _locals from the final exec call in pyobjects (2015.2)
2015-03-21 10:20:32 -06:00
Evan Borgstrom
247d38d1da
This fixes #21796
...
From the Python docs on the exec statement:
> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.
We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 08:03:12 -07:00
Evan Borgstrom
3223a15f83
This fixes #21796
...
From the Python docs on the exec statement:
> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.
We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 07:58:14 -07:00
jfindlay
20066f2f59
Merge pull request #21869 from steverweber/revert-21863-bp-20497
...
Revert "Backport #20497 to 2015.2"
2015-03-20 23:05:44 -06:00
Steve Weber
8020ee4c00
Revert "Backport #20497 to 2015.2"
2015-03-20 23:30:47 -04:00
jfindlay
466e11a02e
Merge pull request #21863 from rallytime/bp-20497
...
Backport #20497 to 2015.2
2015-03-20 20:07:53 -06:00
rallytime
bb5f088820
Add versionadded tag to new function
2015-03-20 16:26:07 -06:00
Highly Unavailable
458c855e05
Fix more errors.
...
That'll teach me not to work in two places at once.
2015-03-20 16:26:07 -06:00
Highly Unavailable
592de1d93c
Fix incorrect variable name
2015-03-20 16:26:07 -06:00
Highly Unavailable
7b87f0d6b0
Fix lint errors and make check more specific
2015-03-20 16:26:07 -06:00
Highly Unavailable
2cca37c5bd
Fix influx API name warnings and user delete bug
...
Some influxdb python API methods changed names and were generating
warnings every time this module was run.
The user_remove method had a bug that actually deleted the user you were
logged in as rather than the user you wanted to delete when run.
Added a method to test login for a user to see if they exist (mostly to
work around a use case described in #20496.) - for example to try logging
in as root:root to see if it's been deleted.
2015-03-20 16:26:06 -06:00
Thomas S Hatch
9bc056d230
Merge pull request #21865 from twangboy/boto
...
Fix adding a user from state file
2015-03-20 16:24:48 -06:00
Colton Myers
1068dd8f66
Merge pull request #21866 from basepi/fixthethings
...
fix the things.
2015-03-20 15:47:34 -06:00
Colton Myers
13c0ea2a73
fix the things.
2015-03-20 15:46:10 -06:00
twangboy
ff62965656
Added missing function parameter
2015-03-20 15:30:51 -06:00
twangboy
4ef2df9b49
Catch OSError as well
2015-03-20 15:29:42 -06:00
twangboy
889d35e802
Fixed Six Import error
2015-03-20 15:28:45 -06:00
jfindlay
1ea3f262a7
Merge pull request #21859 from rallytime/versionadded
...
Added versionadded tags to some new functions and cleaned up """
2015-03-20 14:41:35 -06:00
Colton Myers
9282d9beac
Merge pull request #21829 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-03-20 14:41:29 -06:00
Colton Myers
9b8f6085d2
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/BuildSalt.bat
pkg/windows/installer/Salt-Minion-Setup.nsi
2015-03-20 14:39:22 -06:00
Shane Lee
af01dc7ca5
Merge pull request #21861 from twangboy/build
...
Final (hopefully) improvements to the new build structure
2015-03-20 13:19:32 -07:00
Shane Lee
febef7eb78
Update salt-cp.bat
2015-03-20 14:18:57 -06:00
twangboy
d5da92e58c
Added batchfiles to mimick the behavior of the exe's
2015-03-20 14:12:48 -06:00
twangboy
81025d8388
Fixed version parameter
2015-03-20 13:50:56 -06:00
twangboy
db64bef89c
Updated BuildSalt and Salt-Minion-Setup.nsi
...
- Fixed problem with missing folders and files
- Fixed problem with detecting cpu architecture
2015-03-20 13:48:08 -06:00
Shane Lee
86037bbc4c
Merge pull request #21854 from jfindlay/bp-21791
...
backport #21791 to 2014.7
2015-03-20 12:44:24 -07:00
Colton Myers
270027ff8d
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/modules/mine.py
2015-03-20 13:34:30 -06:00
