Commit Graph

29029 Commits

Author SHA1 Message Date
Samuel Smith
510d3b09bc Merge pull request #11913 from SmithSamuelM/sam_raet_35
Removed references to raet and table from setup.py
2014-04-10 17:03:05 -06:00
Samuel M Smith
a68daa450f Removed references to raet and table from setup.py 2014-04-10 16:59:56 -06:00
Samuel Smith
4090b7d3fc Merge pull request #11911 from SmithSamuelM/sam_raet_35
Fixed some more stuff associated with external Raet
2014-04-10 16:53:28 -06:00
Samuel M Smith
8a69e1a834 Removed master_keys which depends on salt.transport.table which no longer exists 2014-04-10 16:47:13 -06:00
Samuel M Smith
1591613c6f Merge remote-tracking branch 'upstream/develop' into sam_raet_35 2014-04-10 16:43:56 -06:00
Samuel M Smith
894990ee86 Fixed some more porting problems with external raet 2014-04-10 16:42:16 -06:00
Thomas S Hatch
c58851a7de minion needs interface config for raet 2014-04-10 16:02:26 -06:00
Thomas S Hatch
10c9f25f27 I keep learning how to spell :) 2014-04-10 16:02:26 -06:00
Thomas S Hatch
c744686a93 Salt, not self... 2014-04-10 16:02:26 -06:00
Thomas S Hatch
664dd95965 Get the scheduler running in the maintinance 2014-04-10 16:02:26 -06:00
Thomas S Hatch
be4dca858a Include maint behaviors 2014-04-10 16:02:26 -06:00
Thomas S Hatch
1f1f46bad4 Add sceduler to the minion floscript 2014-04-10 16:02:26 -06:00
Thomas S Hatch
7703cf2763 Add maintinance_floscript option to the master 2014-04-10 16:02:26 -06:00
Thomas S Hatch
35dc42451a Add maintinance process floscript 2014-04-10 16:02:26 -06:00
Thomas S Hatch
f6a1d8bd94 clean up floscript comments 2014-04-10 16:02:26 -06:00
Thomas S Hatch
3f6d0929af Add maintinence process to master 2014-04-10 16:02:26 -06:00
Thomas S Hatch
a0e7cc313a Add behavior to call from the master to fork a maintinance process 2014-04-10 16:02:26 -06:00
Thomas S Hatch
418bd3e41c Move to using the routines in salt.daemons.masterapi 2014-04-10 16:02:26 -06:00
Thomas S Hatch
d97743807d Merge conflict adding funcs to masterapi 2014-04-10 16:01:51 -06:00
Thomas S Hatch
2d613ce7b1 Add maint to the flo packge imports 2014-04-10 16:00:55 -06:00
Thomas S Hatch
e12503a79b initial add of maintinance behaviors 2014-04-10 16:00:55 -06:00
Thomas S Hatch
d3b7919c10 Fix floscript style and rely on opts within the behavior 2014-04-10 16:00:55 -06:00
Thomas S Hatch
fe8553d11d Use self.opts within the behaviors
This uses the move to have port etc defined in the behaviors and not in
the floscript
2014-04-10 16:00:55 -06:00
Thomas S Hatch
b5c4869480 make IoInits consistent in the UDP stack 2014-04-10 16:00:55 -06:00
Thomas S Hatch
03fa093395 fix merge conflicts with sam 2014-04-10 15:58:50 -06:00
Thomas S Hatch
73da317cee Merge pull request #11894 from SmithSamuelM/sam_raet_34
Refactor Salt to use external raet
2014-04-10 15:10:48 -06:00
Erik Johnson
3d6d198fc4 Fix 32-bit packages of different arches than the CPU arch
This fixes an issue in which i386 packages were being identified as
pkgname.i386 on an i686 CPU.
2014-04-10 15:20:25 -05:00
Mike Place
1bfa2d4af6 Merge pull request #11908 from eedgar/develop
quote the password string
2014-04-10 13:37:40 -06:00
Eric Edgar
bd8a9d58e3 quote the password string
handle the case where passwords contain [ or ] or : characters which the shell doesn't like.
this changes --password [0:]foo   to be --password '[0:]foo'
2014-04-10 14:35:07 -05:00
Thomas S Hatch
3c95884e71 Merge pull request #11902 from rallytime/pylint_ignore
Pylint ignore names kwarg in pkg.installed
2014-04-10 12:49:51 -06:00
Thomas S Hatch
2eef81ba63 Merge pull request #11897 from so14k/freebsd-doc-fix
- Add directions for Installing Salt on FreeBSD 10 with pkgng.
2014-04-10 12:44:02 -06:00
Thomas S Hatch
a328e4ad6d Merge pull request #11892 from s0undt3ch/hotfix/improved-exit
Don't trace on IOErrors
2014-04-10 12:42:54 -06:00
rallytime
83fde15d0c Print onlyif/unless return codes regardless of success/failure 2014-04-10 12:34:26 -06:00
Thomas S Hatch
a718ecc463 Merge pull request #11866 from techhat/lxc
Add basic conf editing to lxc
2014-04-10 12:34:06 -06:00
Thomas S Hatch
79c08ef9b6 Merge pull request #11857 from cachedout/8799
Catch rendering issues.
2014-04-10 12:28:03 -06:00
rallytime
b6e0fe5975 Pylint fixes 2014-04-10 12:04:50 -06:00
rallytime
8da8dedbec Ignore names arg in pkg.installed 2014-04-10 11:21:16 -06:00
Mike Place
ea8d684c98 Merge pull request #11899 from cachedout/yaml
Link to online YAML parser in docs.
2014-04-10 11:01:24 -06:00
rallytime
809e63c0d5 Pylint Fixes 2014-04-10 10:59:56 -06:00
Mike Place
58bafa3728 Link to online YAML parser in docs. 2014-04-10 10:34:35 -06:00
rallytime
7d02175990 Onlyif return codes added to debug log 2014-04-10 10:02:16 -06:00
Brad Davis
49529ab65d - Add directions for Installing Salt on FreeBSD 10 with pkgng. 2014-04-10 09:03:00 -06:00
Seth House
200aaccd5d Merge pull request #11896 from corywright/fix-file-replace-docs
Add missing : from end of three params in file.replace documentation
2014-04-10 08:58:38 -06:00
Cory Wright
1c6e4dc308 Add missing : from end of three params in file.replace documentation 2014-04-10 10:54:53 -04:00
Pedro Algarvio
601c4c7746 Merge pull request #11858 from terminalmage/hgfs-env-whitelist
Add saltenv whitelist/blacklist to hgfs
2014-04-10 13:09:56 +01:00
Joseph Hall
8fe42880cb Merge pull request #11895 from inthecloud247/patch-13
database spelling
2014-04-10 05:33:22 -06:00
John Albietz
dd480a9a32 database spelling 2014-04-10 03:23:11 -07:00
Erik Johnson
eb0bc63c6b Merge pull request #11888 from cachedout/11874
Handle settings uids and gids that don't resolve.
2014-04-09 21:22:33 -05:00
Samuel M Smith
aa19af474d fixed refactor rename of addRemoteYard 2014-04-09 19:22:56 -06:00
Samuel M Smith
1939d05362 change cach_dir to cachdir
Made basic test work in salt
2014-04-09 19:15:21 -06:00