Commit Graph

37000 Commits

Author SHA1 Message Date
Mike Place
a3ef002d2a Do not log 2014-11-25 12:32:45 -07:00
Gareth J. Greenaway
ed0211bc23 Adding some fixes to the schedule when splay is specified but the seconds option is not. Also allowing splay start and end flags to be equal to lock down splay to a specific number of seconds. 2014-11-25 11:28:50 -08:00
David Boucha
45cf5b9bfb Merge pull request #18473 from fastmarkets/2014.7
Fix bug #18129 in win_service.status.
2014-11-25 10:32:59 -07:00
Thomas S Hatch
ccaaa9fd51 Merge pull request #18467 from rallytime/remove_encoding_arg
Remove encoding kwarg from ustring
2014-11-25 09:36:26 -07:00
Thomas S Hatch
93ddc68b9a Merge pull request #18454 from rallytime/cmd_unittests
Started some unit tests for the cmdmod.py module
2014-11-25 09:35:40 -07:00
Thomas S Hatch
31d8043644 Merge pull request #18450 from jfindlay/quote_apt
quote input in aptpkg mod
2014-11-25 09:34:50 -07:00
Thomas S Hatch
10964ed165 Merge pull request #18449 from cachedout/require_name_in_file_state
Friendly message if name arg is none/false
2014-11-25 09:34:28 -07:00
Mike Place
9e6572fc51 Merge pull request #18452 from cachedout/issue_18380
Pass loglevel in zcbuildout
2014-11-25 09:33:49 -07:00
Thomas S Hatch
456c4d68da Merge pull request #18446 from basepi/filemanagecontentsstring
Force contents to a string in file.managed
2014-11-25 09:16:16 -07:00
Thomas S Hatch
9bfc40cd21 Merge pull request #18442 from jfindlay/quote_rbenv
quote input in rbenv mod
2014-11-25 09:11:19 -07:00
John Carlyle-Clarke
202d17c6cc Fix bug in win_service.status. Make all sc calls use list2cmdline for constistency. 2014-11-25 15:33:11 +00:00
rallytime
b943a3e1d7 Remove encoding kwarg from ustring
Fixes #18458, Refs #18374
2014-11-24 21:05:33 -07:00
Nicole Thomas
4d12e8faff Merge pull request #18464 from rallytime/pylinting
Fix OrderedDict import in runners/lxc.py
2014-11-24 20:35:21 -07:00
rallytime
0909269c62 Fix OrderedDict import in runners/lxc.py 2014-11-24 19:48:43 -07:00
rallytime
dc3c8f91bd Pylint fix 2014-11-24 19:44:54 -07:00
rallytime
792433f915 Started some unit tests for the cmdmod.py module 2014-11-24 17:03:52 -07:00
Mike Place
d33983209e Pass loglevel in zcbuildout
Closes #18380
2014-11-24 16:34:03 -07:00
Mike Place
51b866f7f6 Friendly message if name arg is none/false
Closes #18432
2014-11-24 16:00:52 -07:00
Justin Findlay
68fa2ab5ee quote input in aptpkg mod 2014-11-24 15:49:21 -07:00
Colton Myers
2402d10407 Force contents to a string in file.managed 2014-11-24 15:46:52 -07:00
Justin Findlay
98c581385e pylint fix for quote rbenv mod 2014-11-24 15:32:53 -07:00
Pedro Algarvio
817a0a4f8b Merge pull request #18439 from rallytime/jenkins_argparse
Jenkins argparse
2014-11-24 22:13:35 +00:00
Colton Myers
0bea194481 Merge pull request #18443 from basepi/issue-12483-docs
Add warning to docs about topfile compilation
2014-11-24 14:36:53 -07:00
Colton Myers
42223567b8 Add warning to docs about topfile compilation
Ref #12483
2014-11-24 14:33:37 -07:00
Justin Findlay
a9f5eeec42 quote input in rbenv mod 2014-11-24 14:29:50 -07:00
rallytime
022d2dbbfb Remove unused import 2014-11-24 13:02:08 -07:00
rallytime
512f07303a Put the parser variable in the correct place 2014-11-24 12:13:38 -07:00
Thomas S Hatch
0f6e314abc Merge pull request #18438 from thatch45/odict_clense
Fix #18428
2014-11-24 12:01:04 -07:00
Thomas S Hatch
4fc90e8a1f Fix #18428 2014-11-24 12:00:31 -07:00
rallytime
d2e5443860 Add parser to jenkins.py 2014-11-24 11:58:24 -07:00
Thomas S Hatch
4e2ec16652 Merge pull request #18435 from terminalmage/release_notes
Add 2014.7.0 release to release notes toctree
2014-11-24 11:57:32 -07:00
Thomas S Hatch
e5cbf577b3 Merge pull request #18434 from APSL/apslmaster
Solve problem with special mercurial repos in pip module
2014-11-24 11:57:08 -07:00
Thomas S Hatch
6e5fd0a22a Merge pull request #18411 from Unity-Technologies/osx-fix-macports
Fixed installation of packages via macports on OS X
2014-11-24 11:45:41 -07:00
Thomas S Hatch
84511d7351 Merge pull request #18408 from Unity-Technologies/osx-fix-ip6-localhost
Filter out IPv6 localhost on OS X
2014-11-24 11:44:13 -07:00
Thomas S Hatch
ed6bc7b24f Merge pull request #18382 from thatch45/12255
Add verification of unicode data in windows data sets
2014-11-24 11:22:01 -07:00
Thomas S Hatch
a813f3ba86 Merge pull request #18379 from thatch45/15690
Fixes #15690
2014-11-24 11:21:46 -07:00
Erik Johnson
55b80853f6 Add new release notes file for 2014.7.1 2014-11-24 10:36:46 -06:00
Erik Johnson
22962d097e Fix wording in 2014.1.1 release notes
As this was the first bugfix release for 2014.1.0, it should not be
described as "another" bugfix release.
2014-11-24 10:35:47 -06:00
Erik Johnson
c0d9b84a86 Add 2014.7.0 to toctree 2014-11-24 09:46:48 -06:00
Edu Herraiz
9f85e689f6 Merge remote-tracking branch 'upstream/2014.7' into apslmaster 2014-11-24 16:39:19 +01:00
Daniel Hobley
b75e059138 Fixed installation of packages via macports on OS X
- append/extend on arrays return None and therefore None was being passed to run_all
- compare_dicts function was called incorrectly
2014-11-22 14:50:32 +01:00
Daniel Hobley
7b67c45699 Filter out IPv6 localhost on OS X 2014-11-22 10:52:39 +01:00
Pedro Algarvio
6e0f4da593 Fix syntax errors 2014-11-22 02:16:26 +00:00
Pedro Algarvio
360949c0e0 Merge pull request #18392 from thatch45/listen_fix
Check for listen data struct validity
2014-11-22 02:01:13 +00:00
Joseph Hall
240c8f2eac Merge pull request #18389 from rallytime/fix_unused_arg
Fix unused args in modules/cloud.py
2014-11-21 17:16:46 -07:00
Thomas S Hatch
60a1483bfd Merge pull request #18377 from thatch45/usr_fix
Use the sdecode routine
2014-11-21 17:16:34 -07:00
Joseph Hall
9a38c515cd Merge pull request #18385 from rallytime/cloud_events_doc
Add information about salt-cloud events to master events doc
2014-11-21 17:11:57 -07:00
Pedro Algarvio
49e38788cd Merge pull request #18393 from s0undt3ch/2014.7
Use requests instead of github package. Also output the PR incoming branch
2014-11-21 23:37:13 +00:00
Pedro Algarvio
74e23b9e26 And also the base branch of the incoming PR's branch 2014-11-21 23:35:37 +00:00
Pedro Algarvio
672e98cf0f Use requests instead of github package. Also output the PR incoming branch. 2014-11-21 23:33:29 +00:00