Commit Graph

31680 Commits

Author SHA1 Message Date
Thomas S Hatch
d983c77c5a Merge pull request #13301 from hulu/docker-shadowing
modules.dockerio: avoid shadowing of logs() func
2014-06-06 15:45:23 -06:00
Thomas S Hatch
f6596d6fe3 Merge pull request #13299 from cvrebert/patch-2
salt.client: rm duplicate import of string_types
2014-06-06 15:44:40 -06:00
Thomas S Hatch
8ee03a2af8 Merge pull request #13298 from hulu/sched-list-shadowing
modules.schedule: avoid shadowing built-in list type
2014-06-06 15:44:22 -06:00
Thomas S Hatch
1a8d645beb Merge pull request #13306 from garethgreenaway/odbc_lint
Fixing lint issues in odbc.py.
2014-06-06 15:43:43 -06:00
Gareth J. Greenaway
f133822977 Fixing lint issues in odbc.py. 2014-06-06 14:19:51 -07:00
C. R. Oldham
89c65440c9 Merge pull request #13303 from techhat/clouddocs
Fix errors in cloud docs
2014-06-06 14:29:48 -06:00
Joseph Hall
82d937e6ef Merge pull request #13302 from cro/ss_returner
Add full_ret field to database
2014-06-06 14:01:22 -06:00
Joseph Hall
dcb3afdf5c Update formatting, point to profiles doc 2014-06-06 13:55:51 -06:00
C. R. Oldham
f7c42b0a6e Rename mssql to odbc, this returner can be used for any odbc-compliant database as long as there is a driver for it. 2014-06-06 13:54:49 -06:00
Joseph Hall
755739146f Explain and remove script examples from profiles 2014-06-06 13:47:28 -06:00
C. R. Oldham
154e3948d0 Add full_ret field to database 2014-06-06 13:45:54 -06:00
Joseph Hall
a65ad31ddf Fix copy/paste errors in cloud.profile docs 2014-06-06 13:42:49 -06:00
Thomas S Hatch
59bc87cb21 Merge pull request #13297 from basepi/rosterarg13249
Ensure passwd is a string if defined in roster
2014-06-06 13:30:37 -06:00
Thomas S Hatch
e26df088ed Merge pull request #13296 from cro/ss_returner
First crack at Microsoft SQL Server returner
2014-06-06 13:29:50 -06:00
Chris Rebert
0d65b471bd modules.dockerio: avoid shadowing of logs() func
************* Module salt.modules.dockerio
salt/modules/dockerio.py:1226: [W0621(redefined-outer-name), _create_image_assemble_error_status] Redefining name 'logs' from outer scope (line 417)
2014-06-06 12:17:13 -07:00
Chris Rebert
8aa971d122 salt.client: rm duplicate import of string_types
************* Module salt.client
salt/client/__init__.py:44: [W0404(reimported), ] Reimport 'string_types' (imported line 28)
2014-06-06 12:13:18 -07:00
Chris Rebert
6c09cfa4ca modules.schedule: avoid shadowing built-in list type
************* Module salt.modules.schedule
salt/modules/schedule.py:38: [W0622(redefined-builtin), list] Redefining built-in 'list'
2014-06-06 12:10:48 -07:00
C. R. Oldham
0976085e86 Add me as maintainer 2014-06-06 13:04:32 -06:00
C. R. Oldham
efe32c2f33 Fix some other PG-isms. 2014-06-06 13:01:39 -06:00
Colton Myers
57fa9637de Ensure passwd is a string if defined 2014-06-06 12:53:26 -06:00
C. R. Oldham
5bef1ba851 First crack at an mssql returner 2014-06-06 12:48:51 -06:00
Joseph Hall
e41b6d0d05 Merge pull request #13282 from jaloren/develop
Update topic Getting Started With OpenStack
2014-06-06 12:47:55 -06:00
Khris Richardson
13186f3da0 refactor per recommendation of techhat 2014-06-06 13:26:40 -05:00
Khris Richardson
510aeb11b1 Merge remote-tracking branch 'upstream/develop' into etcd_mods 2014-06-06 13:24:46 -05:00
Khris Richardson
ff327d216d refactor per recommendation of techhat 2014-06-06 13:24:05 -05:00
Joseph Lorenzini
b4e6d3b687 Merge remote-tracking branch 'salt/develop' into develop 2014-06-06 13:07:29 -05:00
Joseph Lorenzini
07e6c2ad5c removed tab characters from topic 2014-06-06 13:05:40 -05:00
Thomas S Hatch
bb5b50faa7 load the modules in the postinitio 2014-06-06 11:03:56 -06:00
Thomas S Hatch
9f66b678c9 run load_modules before any setup 2014-06-06 11:03:09 -06:00
jond64
7f8383ac30 Merge branch 'develop' of https://github.com/saltstack/salt into pkg.installed-add-pkg_verify 2014-06-06 10:43:47 -05:00
Erik Johnson
b170c9b478 Fix to_reinstall
Remove parenthesis. This is a variable, not a function call.
2014-06-06 10:35:20 -05:00
Erik Johnson
2aa20b1406 Merge branch 'downgrade' into develop 2014-06-06 10:33:28 -05:00
Erik Johnson
e80e211a53 Merge branch 'yumpkg.install-downgrade-from-source' of https://github.com/jond64/salt into downgrade 2014-06-06 10:32:56 -05:00
Thomas S Hatch
6c31e33fe1 Merge pull request #13292 from crook/develop
fix #13291
2014-06-06 09:21:57 -06:00
Thomas S Hatch
65bfb9a7b6 Merge pull request #13278 from whiteinge/salt-async-runner-reactor
Execute runner functions asynchronously via the Reactor
2014-06-06 09:17:26 -06:00
Thomas S Hatch
5bd00c9dab Merge pull request #13287 from s0undt3ch/hotfix/lint
Lint Fixes
2014-06-06 09:13:38 -06:00
Thomas S Hatch
6dfbeb3a09 Merge pull request #13155 from jacksontj/conserve_channels
Conserve channels
2014-06-06 09:11:38 -06:00
Mike Place
dcbd8927be Merge pull request #13286 from s0undt3ch/develop
Fix typo
2014-06-06 09:08:57 -06:00
Thomas S Hatch
2492a1fca0 Merge pull request #13273 from garethgreenaway/control_scheudle
Updates to managing schedule code
2014-06-06 09:03:09 -06:00
Ray Chen
a1d939d402 fix #13291 2014-06-06 21:51:05 +08:00
jond64
732eb6e4b9 Add rpm verify option to pkg.installed state 2014-06-06 08:32:18 -05:00
Pedro Algarvio
e1ad39e8b1 Merge pull request #13288 from s0undt3ch/hotfix/jenkins
Hotfix/jenkins
2014-06-06 12:26:24 +01:00
Pedro Algarvio
e02a931894 Print stderr 2014-06-06 12:25:01 +01:00
Pedro Algarvio
a7b7f18e6f Double to single quotes 2014-06-06 12:24:10 +01:00
Pedro Algarvio
4146a0af1a Start ignoring PEP8 E129 and E131
* PEP8 E129: visually indented line with same indent as next logical line
* PEP8 E131: unaligned for hanging indent
2014-06-06 11:43:34 +01:00
Pedro Algarvio
01a48b6b5b Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:37:16 +01:00
Pedro Algarvio
c75fe971af Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:36:55 +01:00
Pedro Algarvio
e273da01c8 Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:36:32 +01:00
Pedro Algarvio
bb5d98568c Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:33:50 +01:00
Pedro Algarvio
9478fb0d27 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:33:31 +01:00