Merge commit 'b53d999529626301c36fa3efa22b2b0165217556' into develop

basho · Mar 15, 2017 · 4721fc4 · 4721fc4
2 parents 9dfdf0b + b53d999
commit 4721fc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rebar.config b/rebar.config
@@ -11,11 +11,11 @@
 {deps,
  [
   {kvc, ".*", {git, "https://github.com/basho/kvc.git", {tag, "v1.5.0"}}},
-  {riak_kv, ".*", {git, "https://github.com/basho/riak_kv.git", {branch, "develop"}}},
+  {riak_kv, ".*", {git, "https://github.com/basho/riak_kv.git", {tag, "2.1.8"}}},
   {ibrowse, "4.*", {git, "https://github.com/basho/ibrowse.git", {tag, "v4.3"}}},
   {fuse, "2.1.0", {git, "https://github.com/basho/fuse.git", {tag, "v2.1.0"}}},
   %% Needed for testing ONLY
-  {riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {tag, "2.5.2"}}}
+  {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", {tag, "2.5.2"}}}
  ]}.
 
 {pre_hooks, [{compile, "./tools/grab-solr.sh"}]}.

diff --git a/src/yz_solr_proc.erl b/src/yz_solr_proc.erl
@@ -401,7 +401,7 @@ check_index_solrconfig(SolrConfigIndexPath, DefaultSolrConfigPath, DefaultSolrCo
 upgrade_solr_config(SolrConfigIndexPath, DefaultSolrConfigPath, Version) ->
     yz_misc:copy_files([DefaultSolrConfigPath], filename:dirname(SolrConfigIndexPath)),
     lager:info(
-        "Upgraded ~s from ~s to the latest version.", [SolrConfigIndexPath, Version]
+        "Upgraded ~s from ~s (or higher) to the latest version.", [SolrConfigIndexPath, Version]
     ).
 
 -spec check_index_solrconfig_version(path()) -> ok.