Thomas S Hatch
ae3a58b7e7
Merge pull request #11025 from terminalmage/11001
...
Clear available pkgs cache when available packages are likely to have changed
2014-03-07 14:07:15 -08:00
Thomas S Hatch
790edd07ac
Merge pull request #11024 from whiteinge/import_text
...
Added load_text filter and import_text tag to Jinja environment
2014-03-07 14:06:19 -08:00
Thomas S Hatch
4f3d70e41f
Merge pull request #11023 from whiteinge/test_exception
...
Added exception and stack functions to the test module
2014-03-07 14:05:16 -08:00
Thomas S Hatch
485112ccd9
Merge pull request #11022 from olliewalsh/issue_11020
...
Fix issue 11020
2014-03-07 14:04:24 -08:00
Thomas S Hatch
ed0779cc9a
Merge branch 'easier-writing-runners-doc' of git://github.com/felixhummel/salt into felixhummel-easier-writing-runners-doc
...
Conflicts:
doc/ref/runners/index.rst
2014-03-07 15:01:18 -07:00
Thomas S Hatch
8c6c608958
Merge branch 'serializers' of git://github.com/johnnoone/salt into johnnoone-serializers
...
Conflicts:
doc/topics/yaml/index.rst
2014-03-07 14:53:03 -07:00
Thomas S Hatch
bd9473be3b
Execution returns route to the master now
2014-03-07 14:51:44 -07:00
Erik Johnson
edc58259f0
Merge pull request #11045 from cachedout/11044
...
Fix wording.
2014-03-07 15:02:45 -06:00
Pedro Algarvio
3893b9109d
Merge pull request #11048 from terminalmage/bsd-syspaths-fallback
...
Make platform variable private
2014-03-07 20:51:11 +00:00
Erik Johnson
1709ad9326
Make platform variable private
...
This makes it so that platform is not exposed as syspaths.platform.
2014-03-07 14:25:58 -06:00
Pedro Algarvio
95ffa7d92b
Merge pull request #11047 from terminalmage/bsd-syspaths-fallback
...
Add BSD fallback for syspaths.CONFIG_DIR
2014-03-07 20:11:09 +00:00
Erik Johnson
56c1c2cc75
Add BSD fallback for syspaths.CONFIG_DIR
...
In the absence of _syspaths.py, make sure that the BSDs still look for
configuration files in /usr/local/etc/salt.
2014-03-07 14:00:58 -06:00
Mike Place
d215da9494
Fix wording.
2014-03-07 12:27:05 -07:00
Pedro Algarvio
82c4605177
Merge pull request #11026 from techhat/bootstrap
...
Start breaking out the bootstrap code into a unified function
2014-03-07 18:42:46 +00:00
Mike Place
0b19979366
Merge pull request #11041 from georgiou/topic/fix_meminfo
...
Fix the docstring for meminfo
2014-03-07 10:21:47 -07:00
Kostas Georgiou
6857f00d0d
Fix the docstring for meminfo
2014-03-07 17:17:09 +00:00
Samuel Smith
284863f522
Merge pull request #11039 from SmithSamuelM/sam_raet_18
...
Sam raet 18 Added support for generic Raet road and key data persistence
2014-03-07 09:58:30 -07:00
Samuel M Smith
460fb1e57b
Merge remote-tracking branch 'upstream/develop' into sam_raet_18
2014-03-07 09:54:02 -07:00
Samuel M Smith
69f521e7f3
added support for auto, main, dirpath for persistence to stack behavior
2014-03-07 09:52:08 -07:00
Joseph Hall
4a3b930e4f
Merge pull request #11028 from gtmanfred/nova
...
Fixing up the nova driver
2014-03-07 08:49:29 -07:00
Daniel Wallace
f5b09301c9
[salt.cloud] pylint fixes for nova driver
2014-03-07 00:10:12 -06:00
Daniel Wallace
561c6653fb
Fixing up the nova driver
2014-03-07 00:03:50 -06:00
Samuel M Smith
78c59c5f7b
Added semantics for accepting keys to joiner/joinent transactions
...
Added redo timers
Added auto accept logic and flag
2014-03-06 22:33:32 -07:00
Thomas S Hatch
35c7c52a89
Merge pull request #11027 from techhat/ibmsce
...
IBM SCE is gone, let's get it out of Salt Cloud
2014-03-06 19:03:57 -08:00
Joseph Hall
e8655a28ad
IBM SCE is gone, let's get it out of Salt Cloud
2014-03-06 19:23:46 -07:00
Joseph Hall
b5c2c13f96
Start breaking out the bootstrap code into a unified function
2014-03-06 19:12:38 -07:00
Erik Johnson
2461e94d0d
clear available pkgs cache when pkgrepo state has changes
...
This clears __context__['pkg._avail'] when a pkgrepo state makes
changes, as this changes the available packages.
2014-03-06 19:30:51 -06:00
Seth House
c94cd38c65
Added unit test for the import_text tag
2014-03-06 17:30:47 -08:00
Thomas S Hatch
8c93e21dec
Merge pull request #11015 from mgwilliams/seed
...
salt.modules.seed: Don't die due to bad symlinks
2014-03-06 17:25:00 -08:00
Thomas S Hatch
1e5e9c88d5
Merge pull request #11019 from cachedout/10945
...
Fix highstate output
2014-03-06 17:20:29 -08:00
Thomas S Hatch
ebe91bd68e
Merge pull request #11011 from cachedout/10971_fix
...
Check for None
2014-03-06 17:14:21 -08:00
Erik Johnson
4b4fb3fb52
clear available pkgs cache when pkg db changes
...
Since repositories can be added in packages (indeed, this is the method
by which EPEL is recommended to be installed), this commit clears the
__context__ variable in which this information is stored, forcing it to
be recreated on the next call to check_db()
2014-03-06 19:13:51 -06:00
Thomas S Hatch
1aedd081b9
Merge pull request #11010 from terminalmage/zmq-grain
...
Add zmqversion grain
2014-03-06 17:12:21 -08:00
Thomas S Hatch
ea8e62e85a
Merge pull request #11004 from chevah/salt-ssh-aix-support
...
Made the salt-ssh shell shim compatible with AIX.
2014-03-06 17:09:52 -08:00
Seth House
80c7e0e87d
Added load_text filter and import_text tag to Jinja environment
2014-03-06 17:09:00 -08:00
Joseph Hall
040d8ae742
Merge pull request #11018 from cachedout/10982
...
Fix --list all option
2014-03-06 18:05:08 -07:00
Seth House
7153904453
Added exception and stack functions to the test module
2014-03-06 16:53:17 -08:00
Ollie Walsh
67106be022
Fix issue 11020
2014-03-07 00:35:01 +00:00
Mike Place
5f9c0bca49
Fix highstate output
...
Refs #10945
2014-03-06 17:02:07 -07:00
Mike Place
f7b5cdfb2f
Fix --list all option
2014-03-06 16:00:40 -07:00
Joseph Hall
fc0b4b7564
Merge pull request #11016 from cachedout/doc_string_fixes
...
Add CLI examples to dockerio and lxc.
2014-03-06 15:13:13 -07:00
Mike Place
8e40db97fd
Add CLI examples to dockerio and lxc.
2014-03-06 14:43:29 -07:00
Matthew Williams
fe19615be3
salt.modules.seed: Don't die due to bad symlinks
2014-03-06 16:34:59 -05:00
Joseph Hall
c42cb6bec3
Merge pull request #11013 from rallytime/keyboard_fix
...
Only allow certain linux systems to run keyboard module
2014-03-06 14:33:16 -07:00
Mike Place
d9fb9e409c
Merge pull request #11014 from makinacorpus/pep8
...
pep8 fixes
2014-03-06 14:32:22 -07:00
Mathieu Le Marec - Pasquet
d31ce8bb93
pep8 fixes
2014-03-06 21:31:44 +00:00
rallytime
14333197d4
Docstring changes
2014-03-06 14:30:43 -07:00
rallytime
264d8dfd42
Only allow certain linux systems to run keyboard module functions
2014-03-06 14:19:01 -07:00
Mike Place
666e82f3bc
Check for None
2014-03-06 14:14:43 -07:00
Erik Johnson
1da97c6217
Add zmqversion grain
...
Like saltversion, this grain can help show the effective version of a
particular component (in this case ZMQ) that is in use on the running
minion, and help aid in troubleshooting.
2014-03-06 15:01:49 -06:00
