7175 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	ef75b44b19	Merge pull request #2210 from romeotheriault/add-solaris-group-module ... Add solaris group module	2012-10-09 17:48:46 -07:00
Romeo Theriault	e277fe00ba	fix some wording	2012-10-09 12:00:38 -10:00
Romeo Theriault	b50c9e7bf5	added solaris group module	2012-10-09 11:54:59 -10:00
Thomas S Hatch	a9059758ef	Finish making tokens work!	2012-10-09 14:20:04 -06:00
Thomas S Hatch	784f7351c7	Make authentication tokens work!	2012-10-09 14:04:21 -06:00
Seth House	6c103bc4df	Changed lookup_jid runner to return empty dict instead of an exception	2012-10-09 13:55:54 -06:00
Thomas S Hatch	0e82d33350	Merge pull request #2208 from whiteinge/salt-fixswarmrootdir ... Fixed bungled default logic for minionswarm root_dir	2012-10-09 11:23:44 -07:00
Seth House	8c18c29323	Fixed bungled default logic for minionswarm root_dir	2012-10-09 12:20:46 -06:00
Thomas S Hatch	6b4368d290	Repair token logic to meet declaration changes	2012-10-09 12:06:14 -06:00
Thomas S Hatch	edc1f13df8	Add -T option to salt command	2012-10-09 11:44:07 -06:00
Thomas S Hatch	c1cfb714e1	Add hook to create auth token	2012-10-09 11:38:29 -06:00
Thomas S Hatch	bfe66bc07e	Prevent double cli calls	2012-10-09 11:16:53 -06:00
Thomas S Hatch	affdc3dcf8	Merge pull request #2207 from corywright/develop ... fix typo: os.path.expand_user -> os.path.expanduser	2012-10-09 09:30:19 -07:00
Cory Wright	efde23eb66	fix typo: os.path.expand_user -> os.path.expanduser	2012-10-09 12:26:46 -04:00
Thomas S Hatch	3f36c901b9	Add resolver method for generating token	2012-10-09 00:55:07 -06:00
Thomas S Hatch	a3774b8669	Make token_file option more robust	2012-10-09 00:17:34 -06:00
Thomas S Hatch	fab0b58556	Merge pull request #2162 from kjkuan/develop ... Fix a problem where an 'unless' in a 'cmd.run' sometimes takes a long time to finish.	2012-10-08 21:31:46 -07:00
Jack Kuan	d36cefdd6c	Merge branch 'develop' of github.com:saltstack/salt into develop	2012-10-09 00:26:47 -04:00
Jack Kuan	cf29938d9d	Simplify the code when retcode==True in _run() of cmdmod.py.	2012-10-09 00:25:36 -04:00
Thomas S Hatch	310b8eb985	Merge branch 'fix-sunos-cpu_module-grain' of git://github.com/romeotheriault/salt into romeotheriault-fix-sunos-cpu_module-grain ... Conflicts: salt/grains/core.py	2012-10-08 20:58:46 -06:00
Romeo Theriault	e793ed125d	make the cpu info call to kstat not rely on a specific cpu number. Fixes an issue where sometimes on solaris the first cpu would not be cpu0.	2012-10-08 16:28:30 -10:00
Thomas S Hatch	8367db3af3	Merge pull request #2201 from whiteinge/salt-minionswarm-opts ... Added flag to set the root_dir for a minionswarm	2012-10-08 13:19:18 -07:00
Seth House	17627fea89	Added flag to set the root_dir for a minionswarm	2012-10-08 14:16:53 -06:00
Thomas S Hatch	1fc20e6677	Merge pull request #2200 from FireHost/fix_windows_meminfo ... Fix windows meminfo	2012-10-08 12:44:25 -07:00
Thomas S Hatch	a2f15d6bfa	Merge pull request #2199 from whiteinge/salt-runnerclient ... Created a RunnerClient class and altered Runner to use it instead	2012-10-08 12:38:15 -07:00
Aaron Tygart	447ffe4d5b	Switch to a mapreduce for Windows mem_total	2012-10-08 14:37:36 -05:00
Seth House	fc54870279	Created a RunnerClient class and altered Runner to use it instead ... Refs #2198	2012-10-08 13:35:58 -06:00
Thomas S Hatch	0d2d9318ea	Merge pull request #2197 from seanchannel/develop ... typo in "code-block" tag	2012-10-08 12:32:29 -07:00
Aaron Tygart	1d97e6bcbb	Switch to WMI call for mem_total on Windows	2012-10-08 14:18:50 -05:00
Sean Channel	3c7d4a815f	typo in "code-block" tag	2012-10-08 12:00:37 -07:00
Thomas S Hatch	77e7e86991	Merge pull request #2191 from uggedal/develop ... Ability to enable/disable and start/stop templated systemd service units...	2012-10-08 09:35:55 -07:00
Thomas S Hatch	310adfe5cf	Merge pull request #2194 from seanchannel/develop ... typo in code_blck	2012-10-08 09:29:29 -07:00
Sean Channel	1b20fb5880	typo in code_blck	2012-10-08 09:22:38 -07:00
Eivind Uggedal	7716f1afa7	Ability to enable/disable and start/stop templated systemd service units. ... Introduces the service.available function which checks that the given service is available without checking for existance in service.get_all.	2012-10-08 16:32:50 +02:00
Thomas S Hatch	756e6cd594	clean up some stragglers from the check_minions change	2012-10-07 23:10:49 -06:00
Thomas S Hatch	aa00565412	Reject expired tokens	2012-10-07 22:42:35 -06:00
Thomas S Hatch	84a4ab4cdd	Add token_expire to master default config	2012-10-07 22:40:41 -06:00
Thomas S Hatch	2b412553d2	Add checks for passing a token	2012-10-07 22:13:49 -06:00
Thomas S Hatch	40e90d644a	Add to access control	2012-10-07 21:40:35 -06:00
Thomas S Hatch	529d9796f4	Merge pull request #2189 from seanchannel/develop ... remove generated files and directories on package purge	2012-10-07 20:11:22 -07:00
Thomas S Hatch	4ce3264a31	Merge pull request #2188 from romeotheriault/add-solaris-package-module ... solaris package module	2012-10-07 20:08:33 -07:00
Sean Channel	04fc649ebc	remove generated files and directories on package purge	2012-10-07 18:32:26 -07:00
Romeo Theriault	d8253f6db1	solaris package module	2012-10-07 15:28:52 -10:00
Thomas S Hatch	97c60e1e2c	Start access control doc	2012-10-07 15:35:18 -06:00
Thomas S Hatch	2970570ce0	Fix old ref to check_minions in the local client	2012-10-07 14:19:31 -06:00
Thomas S Hatch	9f1bb48d00	hook peer system into the new minion checker	2012-10-07 12:41:55 -06:00
Thomas S Hatch	a556a44707	fix jobs runner test for new exception return	2012-10-07 10:20:03 -06:00
Thomas S Hatch	49fc4c11d1	Allow compound commands to be validated ... This still need a cross check, since it will still deny some compound commands that need to be accepted.	2012-10-07 01:38:44 -06:00
Thomas S Hatch	c80de7ead6	Make client_acl use the new system, fix #2006	2012-10-07 01:13:46 -06:00
Thomas S Hatch	d5f462e104	move the checks to an external location	2012-10-07 01:05:18 -06:00