Thomas S Hatch
1fd556f07d
Revert "only load functions and hooks once"
2014-08-21 15:53:40 -06:00
Nahum Shalman
d0dac42958
SmartOS esky build environment instructions cleanup
2014-08-21 17:37:55 -04:00
Thomas S Hatch
0da56fcd03
Merge pull request #15150 from gtmanfred/develop
...
only load functions and hooks once
2014-08-21 15:14:10 -06:00
Pedro Algarvio
1900ce5c3a
Add allow_failure
to root_cmd
2014-08-21 22:05:57 +01:00
Thomas S Hatch
2d47589c88
Merge pull request #15140 from terminalmage/pygit2-auth
...
Add gitfs authentication support for pygit2>=0.20.3
2014-08-21 15:03:35 -06:00
Pedro Algarvio
ebf7269c6b
Remove unused variable
2014-08-21 21:57:16 +01:00
Pedro Algarvio
10a9c39cec
Remove unused variable
2014-08-21 21:56:36 +01:00
Pedro Algarvio
f0f3077c09
No need to format the string
2014-08-21 21:55:11 +01:00
Thomas S Hatch
6ca5cd9ab3
Merge pull request #15157 from saltstack/revert-15136-reload-grains-with-modules-for-states
...
Revert "Reload grains with modules for states"
2014-08-21 14:50:00 -06:00
Thomas S Hatch
5970b4c529
Revert "Reload grains with modules for states"
2014-08-21 14:49:25 -06:00
Thomas S Hatch
899997e3d5
Merge pull request #15153 from nshalman/esky-improvements-2014.7
...
SmartOS esky packaging of 2014.7
2014-08-21 14:38:40 -06:00
Thomas S Hatch
cbca184b13
Merge pull request #15146 from techhat/notpresent
...
Add manage.not_present
2014-08-21 14:38:24 -06:00
Thomas S Hatch
08c8697323
Merge pull request #15123 from cachedout/cli_check_cache
...
Have CLI check job cache
2014-08-21 14:36:10 -06:00
Erik Johnson
ec07a8efea
Get effective username using pwd.getpwduid()
2014-08-21 15:22:54 -05:00
Joseph Hall
065818a0a0
Linting
2014-08-21 14:21:23 -06:00
Thomas S Hatch
44fe6630a6
Merge pull request #15148 from megaclite/develop
...
Fixed put method in swift module
2014-08-21 14:03:20 -06:00
Thomas S Hatch
409df9ebcc
Merge pull request #15147 from pass-by-value/eventlisten_warning
...
Warn if eventlisten is unable to access socket
2014-08-21 14:01:51 -06:00
Nahum Shalman
cdae8948a1
SmartOS esky packaging of 2014.7
...
Resulting builds can be used either with zeromq or with raet
2014-08-21 16:01:46 -04:00
Thomas S Hatch
afa619ac1a
Merge pull request #15127 from teepark/mount-options
...
fix the mount.mounted opts default value behavior
2014-08-21 13:57:10 -06:00
Pedro Algarvio
d08da6bd31
Fallback to rsync
if scp
is not available.
...
This happens with the Cent 5 image from Rackspace
2014-08-21 20:55:46 +01:00
Pedro Algarvio
028a42d9fc
Make salt cloud bail on error'ed ssh commands
2014-08-21 20:53:12 +01:00
Daniel Wallace
cb3151ccfa
only load functions and hooks once
...
novaclient doesn't check if it has already loaded extensions, so we only
want to run this ones, the first time that it is loading, since we
are manually overwriting the classes in memory anyway.
2014-08-21 14:50:18 -05:00
Thomas S Hatch
48c1d2da9f
Merge pull request #15149 from cvrebert/patch-1
...
modules.service.__virtual__: use raw string for regex
2014-08-21 13:40:37 -06:00
Erik Johnson
43de873bb2
D'oh, needed to capitalize USERNAME
2014-08-21 14:35:36 -05:00
Seth House
4abc45397d
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-08-21 13:23:52 -06:00
Chris Rebert
8f01965769
modules.service.__virtual__: use raw string for regex
...
************* Module salt.modules.service
salt/modules/service.py:57: [W1401(anomalous-backslash-in-string), ] Anomalous backslash in string: '\D'. String constant might be missing an r prefix.
2014-08-21 12:00:23 -07:00
John Seybold
65b1273e06
Fixed put method in swift module
...
A logic error in this module prevented salt from being able to use the swift module to put an object inside a swift container.
2014-08-21 14:25:07 -04:00
Erik Johnson
26a3db2ac8
Set USERNAME env var manually in test suite
...
This works around a known issue in GitPython when the USERNAME
environment variable is missing.
2014-08-21 12:19:31 -05:00
Thomas S Hatch
ffc74f28a3
Merge pull request #15139 from Ryanl92/patch-1
...
Fix missing argument in file.replace
2014-08-21 10:55:23 -06:00
Thomas S Hatch
45f447fa84
Merge pull request #15138 from whiteinge/reactor-file_roots
...
Add salt:// support to Reactor sls files
2014-08-21 10:54:43 -06:00
Thomas S Hatch
72ab5a585a
Merge pull request #15137 from garethgreenaway/15087_debian_network_system_fixes
...
Fixes to debian_ip
2014-08-21 10:54:03 -06:00
Aditya Kulkarni
2d98bc16aa
Warn if eventlisten is unable to access socket
2014-08-21 12:53:45 -04:00
Thomas S Hatch
57a0db7190
Merge pull request #15136 from lyft/reload-grains-with-modules-for-states
...
Reload grains with modules for states
2014-08-21 10:52:42 -06:00
Thomas S Hatch
8c4050aeb1
Merge pull request #15132 from cachedout/fail_reason
...
Give user a reason a minion did not return
2014-08-21 10:48:53 -06:00
Thomas S Hatch
8834ca9d91
Merge pull request #15130 from basepi/fullsummary
...
Show all but list of unreturned minions with --summary
2014-08-21 10:48:07 -06:00
Thomas S Hatch
ef9494536e
Merge pull request #15129 from rallytime/schedule_docs
...
Fix broken link in schedule docs
2014-08-21 10:47:21 -06:00
Thomas S Hatch
2f94a25d23
Merge pull request #15128 from rallytime/remove_unused_kwargs
...
Remove **kwargs from pkg.upgrade functions
2014-08-21 10:46:44 -06:00
Thomas S Hatch
854bf8aff5
Merge pull request #15126 from notpeter/develop
...
Improve 2014.7.0 release notes.
2014-08-21 10:37:25 -06:00
Thomas S Hatch
20cfd65d56
Merge pull request #15124 from AccelerationNet/win_services-shell-escaping
...
win: use `subprocess.list2cmdline` to sanitize user input
2014-08-21 10:36:10 -06:00
Thomas S Hatch
9a550db1df
Merge pull request #15121 from wackycaptain/fix-ssh-auth-present-test
...
Fix ssh_auth.present test when enc != ssh-rsa
2014-08-21 10:32:37 -06:00
Thomas S Hatch
b609c41ddd
Merge pull request #15119 from lyft/proper-returns-for-boto-states
...
Return True by default in boto states
2014-08-21 10:27:38 -06:00
Thomas S Hatch
33eb7d4692
Merge pull request #15118 from cachedout/range_docs
...
Document seco range
2014-08-21 10:25:32 -06:00
Thomas S Hatch
6958e71eda
Merge pull request #15112 from samuelpenn/develop
...
Added support for wildcard characters in package version strings.
2014-08-21 10:24:12 -06:00
Thomas S Hatch
33d1c1d10a
Merge pull request #15079 from garethgreenaway/apt_dont_install_recommends
...
Changes to aptpkg.py and pkg state
2014-08-21 10:16:28 -06:00
Thomas S Hatch
8a3e892f47
Merge pull request #15064 from tserong/patch-1
...
Fix service.py version parsing for SLE 11
2014-08-21 10:15:58 -06:00
Thomas S Hatch
45e71cdd30
Merge pull request #15060 from YanChii/file_append_bug
...
corrected file.append test state
2014-08-21 10:15:12 -06:00
Joseph Hall
b5744a54f8
Add manage.not_present
2014-08-21 09:13:27 -06:00
Samuel Penn
ff19919f24
Merge remote-tracking branch 'upstream/develop' into develop
2014-08-21 13:44:38 +01:00
Erik Johnson
a198124249
Remove obsoleted variable PYGIT2_TRANSPORTS
2014-08-21 00:17:28 -05:00
Erik Johnson
5444c68437
Update docs to reflect pygit2 auth support in 0.20.3
2014-08-20 23:54:48 -05:00