Skip to content

Commit

Permalink
Merge pull request #1036 from untergeek/doc/5.2.0dev0_build1
Browse files Browse the repository at this point in the history
Fix doc build issue
  • Loading branch information
untergeek committed Aug 23, 2017
2 parents 52fc129 + cf08108 commit 31449ed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions docs/Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Changelog
preserving API integrity. The new ``run`` function allows lambda and other
users to `run` Curator from the API with only a client configuration file
and action file as arguments. Requested in #1031 (untergeek)
* Allow use of time/date string interpolation for Rollover index naming.
Added in #1010 (tschroeder-zendesk)


5.1.2 (08 August 2017)
Expand Down
2 changes: 1 addition & 1 deletion docs/asciidoc/actions.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ as needed.
=== Optional settings

* <<option_continue,continue_if_exception>>
* <<option_ignore_empty_list,ignore_empty_list>>
* <<option_ignore_empty,ignore_empty_list>>
* <<option_delete_after,delete_after>>
* <<option_disable,disable_action>>
* <<option_extra_settings,extra_settings>>
Expand Down

0 comments on commit 31449ed

Please sign in to comment.