Repository: oodt Updated Branches: refs/heads/master 9f48fea19 -> 241c1dae7
Resolve merge conflicts. Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/241c1dae Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/241c1dae Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/241c1dae Branch: refs/heads/master Commit: 241c1dae73747140067c1affa20e8c1ca0c5ed56 Parents: 9f48fea Author: Chris Mattmann <[email protected]> Authored: Fri Nov 10 17:51:28 2017 -0800 Committer: Chris Mattmann <[email protected]> Committed: Sun Feb 4 09:49:58 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/241c1dae/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4e50f80..e9861c5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,10 +9,16 @@ Release 1.3 - In Progress * OODT-958 Update commons-collections * OODT-959 Update tika to 1.16 +======= +Release 1.2.1 - 11/10/2017 + +* OODT-967 Solr version for 1.2.1 breaks SolrDumper in File Manager (mattmann) + Release 1.2 - 08/14/2017 -* OODT-955 Fix numhits error in Lucene Catalog -* OODT-956 Add connection checks to components +* OODT-955 Fix numhits error in Lucene Catalog (magicaltrout) + +* OODT-956 Add connection checks to components (magicaltrout) Release 1.1 - 07/18/2017
