Thomas S Hatch
|
02a4c41ae1
|
Merge pull request #22769 from mgwilliams/lithium-utils-compat
add utils/compat.py
|
2015-04-17 08:42:21 -06:00 |
|
Thomas S Hatch
|
134d117eef
|
Merge pull request #22767 from mgwilliams/lithium-loader
loader: add missing import
|
2015-04-17 08:41:33 -06:00 |
|
Matthew Williams
|
8db0ccf529
|
add utils/compat.py
|
2015-04-17 04:58:30 +00:00 |
|
Matthew Williams
|
53b0f0c93f
|
loader: add missing import
|
2015-04-17 04:34:40 +00:00 |
|
Nicole Thomas
|
d14710acce
|
Merge pull request #22756 from jfindlay/fix_saltmod
fix saltmod.function unit test
|
2015-04-16 16:01:11 -06:00 |
|
Justin Findlay
|
cf94017d88
|
fix saltmod.function unit test
|
2015-04-16 14:41:46 -06:00 |
|
Thomas S Hatch
|
b6e803910f
|
Merge pull request #22753 from thatch45/doc_clear
fix some bad sls data in a doc
|
2015-04-16 11:58:17 -06:00 |
|
Thomas S Hatch
|
b20dbb822b
|
fix some bad sls data in a doc
|
2015-04-16 11:49:35 -06:00 |
|
Colton Myers
|
8d1e9e8010
|
Merge pull request #22752 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
|
2015-04-16 11:47:40 -06:00 |
|
Colton Myers
|
ccfcedbf6b
|
Go back to the 2015.2 version of salt.7
|
2015-04-16 11:46:30 -06:00 |
|
Thomas S Hatch
|
ef5d6c1035
|
Merge branch 'cachedout-issue_18512' into 2015.2
|
2015-04-16 10:55:18 -06:00 |
|
Thomas S Hatch
|
a9e1a0943a
|
lint
|
2015-04-16 10:54:54 -06:00 |
|
Thomas S Hatch
|
13d161f2d7
|
Merge branch 'issue_18512' of https://github.com/cachedout/salt into cachedout-issue_18512
|
2015-04-16 10:54:29 -06:00 |
|
Thomas S Hatch
|
23a4f0d720
|
Merge pull request #22735 from plastikos/improvement-portability_tweak
Use string_types for portability
|
2015-04-16 10:46:58 -06:00 |
|
Colton Myers
|
8d9874a78a
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
2015-04-16 10:37:38 -06:00 |
|
Thomas S Hatch
|
94e4e6bc1e
|
Merge pull request #22723 from thatch45/lazy_layers
Fix the lazy loader to keep a top level key ref
|
2015-04-16 10:36:26 -06:00 |
|
Nicole Thomas
|
75348e5113
|
Merge pull request #22748 from twangboy/fix_bat
Changed %cd% to %~dp0
|
2015-04-16 10:27:31 -06:00 |
|
Nicole Thomas
|
1bb93d29af
|
Merge pull request #22660 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
|
2015-04-16 10:00:11 -06:00 |
|
Thomas S Hatch
|
c003252a8e
|
Fix test
|
2015-04-16 09:33:50 -06:00 |
|
salt_build
|
2d3d0b1c15
|
Changed %cd% to %~dp0
|
2015-04-16 15:07:28 +00:00 |
|
Justin Findlay
|
bacbf6cfa5
|
Merge pull request #22741 from jayeshka/lvm-states-unit-test
adding states/lvm test case
|
2015-04-16 07:20:10 -06:00 |
|
Justin Findlay
|
988ea97a0c
|
Merge pull request #22739 from rahulhan/states_network_unit_tests
Adding states/network.py unit tests
|
2015-04-16 07:19:22 -06:00 |
|
Jayesh Kariya
|
a32da0c8df
|
adding states/lvm test case
|
2015-04-16 17:09:26 +05:30 |
|
Rahul Handay
|
2a977cada7
|
Adding states/network.py unit tests
|
2015-04-16 16:19:21 +05:30 |
|
Thayne Harbaugh
|
f23d10e85a
|
Use string_types for portability
|
2015-04-16 02:39:22 -06:00 |
|
Thomas S Hatch
|
787ec88373
|
Merge pull request #22716 from twangboy/list_pkg_fix
Removed list_pkgs caching
|
2015-04-15 22:51:02 -06:00 |
|
Thomas S Hatch
|
7e91de265c
|
fix pyobjects loader change
|
2015-04-15 22:48:34 -06:00 |
|
Shane Lee
|
e1ee7db991
|
Update win_pkg.py
Fixed some lint
|
2015-04-15 22:10:02 -06:00 |
|
Thomas S Hatch
|
27ab725cf4
|
flix another place where the . is expected
|
2015-04-15 20:49:40 -06:00 |
|
Thomas S Hatch
|
19f35d42c4
|
fix attr lookups to use getitem
|
2015-04-15 19:44:06 -06:00 |
|
Thomas S Hatch
|
29d491964e
|
Add attr_call test function
|
2015-04-15 19:43:41 -06:00 |
|
Thomas S Hatch
|
f8cdc5060e
|
fix sysdoc tests for new module level hooks
|
2015-04-15 19:42:23 -06:00 |
|
Colton Myers
|
f84bfdba83
|
Merge pull request #22719 from basepi/fix_minion_id_generation
Fix minion id generation
|
2015-04-15 19:26:18 -06:00 |
|
Thomas S Hatch
|
e9bd812ef8
|
Add module_report function to test
|
2015-04-15 18:11:44 -06:00 |
|
Thomas S Hatch
|
c1400fa60e
|
prevent grains from loading the module layer
|
2015-04-15 18:09:00 -06:00 |
|
Thomas S Hatch
|
c900c31a7b
|
clear out grains and pillar in lazy loader so they don't collide with getattr in lazydict
|
2015-04-15 16:59:25 -06:00 |
|
Thomas S Hatch
|
c6a3dbf65e
|
Merge pull request #22717 from ckochenower/2015.2
Eliminate a strack trace when calling jobs.list_jobs for a returner
|
2015-04-15 16:51:59 -06:00 |
|
Thomas S Hatch
|
294aa316dc
|
Merge pull request #22718 from thatch45/static_load
Add a static loader function
|
2015-04-15 16:51:31 -06:00 |
|
Thomas S Hatch
|
8d5252adf7
|
Add a getattr to the lazy dict to translate base modules
|
2015-04-15 16:47:07 -06:00 |
|
Thomas S Hatch
|
7b0ee44df0
|
Also make a nested dict ref
|
2015-04-15 16:41:42 -06:00 |
|
Thomas S Hatch
|
586b81b33e
|
Add tests for the jinja demands
|
2015-04-15 16:39:08 -06:00 |
|
Thomas S Hatch
|
59fe49bb2c
|
Make the lower level key also show up in the loader
|
2015-04-15 16:37:46 -06:00 |
|
Colton Myers
|
134889a27a
|
Fix other instances of minion_id
|
2015-04-15 16:17:37 -06:00 |
|
Colton Myers
|
720a0fdef6
|
Rename minion_id to cache_minion_id
|
2015-04-15 14:58:42 -06:00 |
|
Nicole Thomas
|
b0602d661c
|
Merge pull request #22712 from jfindlay/state_test
fix test_sls_id unit test
|
2015-04-15 14:50:41 -06:00 |
|
Colton Myers
|
45ffa0688e
|
Fix minion_id generation
|
2015-04-15 14:46:46 -06:00 |
|
Thomas S Hatch
|
a422fa42ca
|
Add a static loader function
|
2015-04-15 14:29:25 -06:00 |
|
Corin Kochenower
|
6db2cde86d
|
Eliminate a strack trace when calling jobs.list_jobs for a returner
that returns a list of jids. Interim solution to #22713
|
2015-04-15 13:53:14 -06:00 |
|
salt_build
|
2ce35d2621
|
Removed list_pkgs caching
|
2015-04-15 19:47:30 +00:00 |
|
Justin Findlay
|
3d2221ded4
|
fix test_sls_id unit test
|
2015-04-15 12:53:50 -06:00 |
|