Commit Graph

27159 Commits

Author SHA1 Message Date
Colton Myers
9655d89c4c Remove trailing space 2014-03-04 10:22:39 -07:00
Thomas S Hatch
42e21d384b Merge pull request #10890 from mrene/develop
Fire the event's data, not the entire _minion_event command
2014-03-04 08:50:20 -08:00
Joseph Hall
e3ac2779eb Merge pull request #10933 from garethgreenaway/develop
Added quotes surrounding the filename in the untar portion of the archive.py state.
2014-03-04 09:30:00 -07:00
Gareth J. Greenaway
d4bf456e29 Added quotes surrounding the filename in the untar portion of the archive.py state. Necessary if filename has spaces in it. 2014-03-04 08:12:40 -08:00
Joseph Hall
ff785b775b Merge pull request #10923 from pengyao/readlines
Return list without newlines character
2014-03-04 09:04:24 -07:00
Darrel Clute
61271eb747 updated version changed to correct current codename 2014-03-04 08:56:05 -07:00
Darrel Clute
02d2e4867d updated version changed to correct current codename 2014-03-04 08:54:59 -07:00
Mike Place
d0ce189b90 Merge pull request #10929 from oz123/develop
Improve windows-package-manager documentation
2014-03-04 06:19:10 -07:00
Mike Place
9d796fd672 Merge pull request #10925 from gravyboat/develop
file module doc update, and pkg state update for names.
2014-03-04 06:18:08 -07:00
Oz Nahum
86baf5bb53 Improve windows-package-manager documentation
Fix for issue #10234
2014-03-04 14:08:52 +01:00
Mathieu Le Marec - Pasquet
b67154c436 salt.modules.lxc: fix warning
/cc @mgwilliams
2014-03-04 10:12:37 +00:00
pengyao
3876bb65b3 Interface should restart to validate if it's up
Fixed "Interface's change will not valid if it's up", and add ret['changes']['status'] for enabled
2014-03-04 14:48:56 +08:00
Thomas S Hatch
53de71b6d4 linf fix 2014-03-03 22:37:45 -07:00
Thomas S Hatch
562fe7758e Fix transmittion to master for client 2014-03-03 22:34:33 -07:00
Thomas S Hatch
fa131d48ad Use get_local_client in salt cli tool 2014-03-03 22:13:06 -07:00
Thomas S Hatch
848207e541 Add client.raet to packages 2014-03-03 22:10:43 -07:00
Thomas S Hatch
3689c2bfa8 re-import salt.config to avoid var confusion 2014-03-03 22:09:57 -07:00
Thomas S Hatch
61da4c50c9 Add factory function for getting the local client
Reads in from the confir and returns the correct client
2014-03-03 22:02:46 -07:00
Forrest Alvarez
bb6cee933a Updated the pkg state to support explaining what the names option does. 2014-03-04 04:52:12 +00:00
Forrest Alvarez
9a7f9018b4 Merge remote branch 'upstream/develop' into develop 2014-03-04 04:51:53 +00:00
Forrest Alvarez
1799ba1ab9 Added a note regarding the supported hash types. 2014-03-04 04:40:01 +00:00
Thomas S Hatch
4e09b7f859 LocalFuncs does not need the master key 2014-03-03 21:35:24 -07:00
Thomas S Hatch
66296ad1d9 Load up the local user access keys in ioflo master 2014-03-03 21:32:12 -07:00
Thomas S Hatch
c406e05827 ioflo does not like __init__ to be called it seems... 2014-03-03 21:18:40 -07:00
pengyao
bae9053f6f Return list without newlines character
For better display like `salt '*' ip.get_interface eth0`
2014-03-04 11:41:02 +08:00
Erik Johnson
803d197f34 hgfs: log full traceback caught during fetch 2014-03-03 19:55:48 -06:00
Erik Johnson
9474b1ba31 gitfs: log full traceback caught during fetch 2014-03-03 19:55:42 -06:00
Erik Johnson
8fda2fe288 Log tracebacks caught in fileserver updates
When a traceback is triggered in a fileserver update, it is caught and
printed. However, all that is printed is the result of exc.__str__(),
which is not helpful when debugging, and makes it harder to track down
fileserver update issues. This commit changes the behavior and writes
the full text of the exception to the master log.
2014-03-03 19:50:36 -06:00
Daniel Wallace
3884308dbf Clean up pylint 2014-03-03 19:34:57 -06:00
Daniel Wallace
55c485c81c Fix pep8 spacing 2014-03-03 19:23:25 -06:00
Daniel Wallace
bd102cd503 Comment all functions 2014-03-03 19:16:08 -06:00
Thomas S Hatch
8ef2fce934 Add raet LocalClient - just starting 2014-03-03 17:58:00 -07:00
Samuel Smith
7ee1732705 Merge pull request #10919 from SmithSamuelM/sam_raet_15
Sam raet 15 Some refactoring in preparation for more reliability in transactions
2014-03-03 17:42:41 -07:00
Samuel M Smith
6ec37b0aff run both tests by default 2014-03-03 17:41:03 -07:00
Samuel M Smith
f6e3ff808c Merge remote-tracking branch 'upstream/develop' into sam_raet_15
Conflicts:
	salt/daemons/flo/master.flo
2014-03-03 17:39:43 -07:00
Daniel Wallace
b57c21ca0a Make sure the util can import novaclient 2014-03-03 18:35:10 -06:00
Samuel M Smith
25b449898a Added extra check to help make yard names unique
But not guaranateed
2014-03-03 17:20:23 -07:00
Samuel M Smith
139f76685b Added test for Yid being passed in matching next Yid 2014-03-03 16:40:34 -07:00
Erik Johnson
76f581104a Fix gitfs regression
This was introduced when I added the gitfs whitelists feature recently.
If the base environment is requested, it will not be matched since the
branch name is passed to the _get_tree_* functions.
2014-03-03 17:37:29 -06:00
Samuel M Smith
cb315f8a9d finished refactor rnaming device to estate and all vestiges 2014-03-03 16:33:42 -07:00
Thomas S Hatch
3d07a59d84 Factor out payload_kwargs generation from the LocalClient.pub 2014-03-03 16:24:55 -07:00
Samuel M Smith
7f32e0fc42 More refactoring rnaming 2014-03-03 16:19:43 -07:00
Samuel M Smith
08599fe7eb renamed stack.devices to stack.estates 2014-03-03 16:10:25 -07:00
Darrel Clute
414bcfd723 Add initial support for user expiry via user state 2014-03-03 16:03:34 -07:00
Samuel M Smith
e9886657b0 Change device to estate to be consistent with new metaphor 2014-03-03 16:01:02 -07:00
Nathan Rini
16db34af6c Add options '--force-color' and '--no-color' to salt-run
Add salt-run help to include new commands
```
  Output Options:
    Configure your preferred output format

    --no-color, --no-colour
                        Disable all colored output
    --force-color, --force-colour
                        Force colored output
```
2014-03-03 15:29:25 -07:00
Thomas S Hatch
89f2d03828 Lint fixes 2014-03-03 15:23:51 -07:00
Thomas S Hatch
5b76e81104 Add uxdrouter and local cmd to the master flosrcipt 2014-03-03 15:18:40 -07:00
Michal Bicz
e381b0c781 make DefaultOrderedDict more sane 2014-03-03 14:11:29 -08:00
Daniel Wallace
131cf5dca9 I forgot how to python 2014-03-03 16:10:47 -06:00