Skip to content

Commit

Permalink
0.11.4 has been ready for several days
Browse files Browse the repository at this point in the history
  • Loading branch information
ctdk committed May 8, 2017
1 parent e5ab8b9 commit 69412f4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.11.4 (unreleased)
0.11.4
------
* Implement Chef authentication version 1.3.
* Move the custom goiardi error type out of util and into its own module.
Expand Down
4 changes: 1 addition & 3 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ type Options struct {
}

// The goiardi version.
const Version = "0.11.4-pre2"
const Version = "0.11.4"

// The chef version we're at least aiming for, even if it's not complete yet.
const ChefVersion = "11.1.7"
Expand Down Expand Up @@ -395,8 +395,6 @@ func ParseConfigOptions() error {
Config.PgSearch = opts.PgSearch
}



if !((Config.DataStoreFile == "" && Config.IndexFile == "") || ((Config.DataStoreFile != "" || (Config.UseMySQL || Config.UsePostgreSQL)) && Config.IndexFile != "")) {
err := fmt.Errorf("-i and -D must either both be specified, or not specified")
log.Println(err)
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
# The short X.Y version.
version = '0.11.4'
# The full version, including alpha/beta/rc tags.
release = '0.11.4-pre1'
release = '0.11.4'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion indexer/file_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ func (i *FileIndex) Load() error {
fp.Close()
return err
}

tmpi.m.Lock()
defer tmpi.m.Unlock()
i.idxmap = tmpi.idxmap
Expand Down

0 comments on commit 69412f4

Please sign in to comment.